ChangeLogTag: Sun Jun 8 19:53:04 2003 Pradeep Gore <pradeep@oomworks.com>

221 files changed, 12003 insertions, 3779 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2eb7944eced..14e2ed33c80 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,11 +1,383 @@
+Sun Jun  8 19:53:04 2003  Pradeep Gore  <pradeep@oomworks.com>
+
+        * orbsvcs/orbsvcs/Notify/AdminProperties.cpp:
+           cosmetic changes.
+
+        * orbsvcs/orbsvcs/Notify/Consumer.h:
+        * orbsvcs/orbsvcs/Notify/Consumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Consumer.inl:
+	  Inlined <push> method
+
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp:
+        * orbsvcs/orbsvcs/Notify/Properties.cpp:
+          Changed default initialization of ThreadPoolParams structure.
+
+        * orbsvcs/orbsvcs/Notify/Event.h:
+        * orbsvcs/orbsvcs/Notify/Event.cpp:
+        * orbsvcs/orbsvcs/Notify/Event.inl:
+          - "const"ified various public methods.
+          - Added helper classes for the TAO_NS_Event_var
+
+        * orbsvcs/orbsvcs/Notify/FilterAdmin.h:
+        * orbsvcs/orbsvcs/Notify/FilterAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/FilterAdmin.inl:
+          Changed signature of <match> method, moved this method to the
+          .inl file.
+
+        * orbsvcs/orbsvcs/Notify/Method_Request.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request.inl:
+          - Added <TAO_NS_Method_Request_No_Copy> class that does not copy the
+          event that it holds.
+          - Moved the <init> method to the .inl file
+
+        * orbsvcs/orbsvcs/Notify/Method_Request_Event.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Event.inl:
+          Moved the <Method_Request_Event> to its own seperate file.
+
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl:
+
+          Helper templatized logic for dispatching. This is required to
+          support different types of event implementations (Event_var and Event*)
+          and proxy implementations (ProxySupplier_Guard and ProxySupplier).
+
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.inl:
+
+          There are 3 different approaches to memory management during
+          event dispatching:
+          <TAO_NS_Method_Request_Dispatch> - This class increments the
+          reference count on the event copy and on the proxysupplier.
+
+          <TAO_NS_Method_Request_Dispatch_No_Copy> - The event is not
+          copied and the refcount on the proxysupplier is not incremented.
+
+         <TAO_NS_Method_Request_Dispatch_T> - The refcount on the event is
+          incremented but not for the proxysupplier.
+
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_No_Filtering.*:
+          Removed this file. The Method_request_Dispatch accepts a flag
+          that is used to determine if the filters should be executed.
+
+        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.inl:
+
+          Implements <TAO_NS_Method_Request_Lookup> and
+          <TAO_NS_Method_Request_Lookup_No_Copy> classes.
+
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.h:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp:
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.inl:
+
+          Implements <TAO_NS_Method_Request_Updates> and
+          <TAO_NS_Method_Request_Updates_No_Copy> classes.
+
+        * orbsvcs/orbsvcs/Notify/Object.h:
+        * orbsvcs/orbsvcs/Notify/Object.inl:
+          Added accessor for the Event_Manager.
+
+        * orbsvcs/orbsvcs/Notify/Peer.cpp:
+          Using Proxy_Guard instead of Refcountable_Guard
+
+        * orbsvcs/orbsvcs/Notify/Property_T.h:
+        * orbsvcs/orbsvcs/Notify/Property_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Property_T.inl:
+        * orbsvcs/orbsvcs/Notify/Property_Boolean.h:
+        * orbsvcs/orbsvcs/Notify/Property_Boolean.cpp:
+        * orbsvcs/orbsvcs/Notify/Property_Boolean.inl:
+          Changed type of property name from CString to char*.
+
+        * orbsvcs/orbsvcs/Notify/Proxy.h:
+        * orbsvcs/orbsvcs/Notify/Proxy.cpp:
+        * orbsvcs/orbsvcs/Notify/Proxy.inl:
+          Changed <check_filter> to TAO_NS_Event* instead of
+          TAO_NS_Event_var.
+          Moved the method to the .inl file.
+
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.h:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.inl:
+          Removed <push> method from this class.
+          Defined the TAO_NS_ProxyConsumer_Guard class.
+
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.h:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.inl:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.h:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.inl:
+          Modifed <push> method to include ACE_ENV parameter.
+          Defined the TAO_NS_ProxySupplier_Guard class.
+
+        * orbsvcs/orbsvcs/Notify/QoSProperties.cpp:
+          Access property using <value> method.
+
+        * orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp:
+          Use the priority model passed in the Pool/Lane parameter.
+
+        * orbsvcs/orbsvcs/Notify/Reactive_Task.h:
+        * orbsvcs/orbsvcs/Notify/Reactive_Task.cpp:
+          Modifed the <execute> method to include ACE_ENV parameter.
+
+        * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h:
+        * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl:
+          A helper class that increments the reference count in the
+          constructor. The count is decremented in the destructor.
+
+        * orbsvcs/orbsvcs/Notify/Worker_Task.h:
+          Modifed the <execute> method to include ACE_ENV parameter.
+
+        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp:
+
+          Modifed the <push> methods to include ACE_ENV parameter.
+
+        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp:
+
+          Modifed the <push> methods to include ACE_ENV parameter.
+
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h:
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp:
+
+          Modified the <TAO_NS_StructuredEvent> constructor to read the
+          qos parameters directly instead of using the expensive
+          TAO_NS_PropertySeq class.
+
+          Implements 2 types of structured event wrappers - the
+          <TAO_NS_StructuredEvent_No_Copy> does not make a copy of the event.
+
+          The <TAO_NS_StructuredEvent> creates a copy of the event.
+
+        * orbsvcs/orbsvcs/Notify/StructuredProxyPushConsumer.cpp:
+          The <push_structured_event> does not make a copy of the event
+          and the Lookup method request object is created on the stack.
+          We have optimized by not making allocations until it it required.
+
+        * orbsvcs/orbsvcs/Notify/StructuredPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/StructuredPushConsumer.h:
+          signature of <push_i> is changed to accept TAO_NS_Event*.
+
+        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.h:
+        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp:
+          Implements the <TAO_NS_AnyEvent> and <TAO_NS_AnyEvent_No_Copy>
+          classes.
+
+        * orbsvcs/orbsvcs/Notify/ProxyPushConsumer.cpp:
+          Optimized <push> avoids unnecessary copies.
+
+        * orbsvcs/orbsvcs/Notify/PushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/PushConsumer.h:
+          signature of <push_i> is changed to accept TAO_NS_Event*.
+
+        * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp:
+          Optimized <push> avoids unnecessary copies.
+
+        * orbsvcs/orbsvcs/Notify/SequencePushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/SequencePushConsumer.h:
+          signature of <push_i> is changed to accept TAO_NS_Event*.
+
+        * orbsvcs/tests/Notify/lib/Peer.h:
+        * orbsvcs/tests/Notify/lib/Peer_T.h:
+        * orbsvcs/tests/Notify/lib/Peer.inl:
+        * orbsvcs/tests/Notify/lib/Peer_T.inl:
+        * orbsvcs/tests/Notify/lib/Peer.cpp:
+        * orbsvcs/tests/Notify/lib/Peer_T.cpp:
+
+          Template implementation of Suppliers and Consumers.
+
+        * orbsvcs/tests/Notify/lib/Consumer_T.h:
+        * orbsvcs/tests/Notify/lib/Consumer_T.cpp:
+        * orbsvcs/tests/Notify/lib/Consumer_T.inl:
+
+          Specialization of Peer_T for Consumers.
+
+        * orbsvcs/tests/Notify/lib/Supplier_T.h:
+        * orbsvcs/tests/Notify/lib/Supplier_T.cpp:
+        * orbsvcs/tests/Notify/lib/Supplier_T.inl:
+
+          Specialization of Peer_T for Suppliers.
+
+        * orbsvcs/tests/Notify/lib/Direct_Consumer.h:
+        * orbsvcs/tests/Notify/lib/Direct_Consumer.inl:
+        * orbsvcs/tests/Notify/lib/Direct_Consumer.cpp:
+
+          A consumer that receives events directly from a supplier and
+          hence does not connect to the EventChannel.
+
+        * orbsvcs/tests/Notify/lib/Relay_Consumer.h:
+        * orbsvcs/tests/Notify/lib/Relay_Consumer.cpp:
+        * orbsvcs/tests/Notify/lib/Relay_Consumer.inl:
+
+          A Direct_Consumer that relays the event received to yet another
+          consumer.
+
+        * orbsvcs/tests/Notify/lib/Direct_Supplier.h:
+        * orbsvcs/tests/Notify/lib/Direct_Supplier.cpp:
+        * orbsvcs/tests/Notify/lib/Direct_Supplier.inl:
+
+          A supplier that sends directly to a consumer and
+          hence does not connect to the EventChannel.
+
+        * orbsvcs/tests/Notify/lib/PushConsumer.h:
+        * orbsvcs/tests/Notify/lib/PushConsumer.cpp:
+        * orbsvcs/tests/Notify/lib/PushConsumer.inl:
+
+          Traits based implementation of ProxyConsumer.
+
+        * orbsvcs/tests/Notify/lib/PushSupplier.h:
+        * orbsvcs/tests/Notify/lib/PushSupplier.cpp:
+        * orbsvcs/tests/Notify/lib/PushSupplier.inl:
+
+          Traits based implementation of ProxySupplier.
+
+        * orbsvcs/tests/Notify/lib/SequencePushConsumer.h:
+        * orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp:
+        * orbsvcs/tests/Notify/lib/SequencePushConsumer.inl:
+
+          Traits based implementation of SequenceProxyConsumer.
+
+        * orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp:
+        * orbsvcs/tests/Notify/lib/SequencePushSupplier.h:
+        * orbsvcs/tests/Notify/lib/SequencePushSupplier.inl:
+
+          Traits based implementation of SequenceProxySupplier.
+
+        * orbsvcs/tests/Notify/lib/StructuredPushConsumer.h:
+        * orbsvcs/tests/Notify/lib/StructuredPushConsumer.inl:
+        * orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp:
+
+          Traits based implementation of StructuredProxyConsumer.
+
+        * orbsvcs/tests/Notify/lib/StructuredPushSupplier.h:
+        * orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp:
+        * orbsvcs/tests/Notify/lib/StructuredPushSupplier.inl:
+
+          Traits based implementation of StructuredProxySupplier.
+
+
+        * orbsvcs/tests/Notify/lib/Activation_Manager.cpp:
+          Prints hostname to data file.
+
+        * orbsvcs/tests/Notify/lib/Driver.cpp:
+          The thread that executes command objects is initialized to ACE_DEFAULT_THREAD_PRIORITY.
+
+        * orbsvcs/tests/Notify/lib/EventChannel.h:
+        * orbsvcs/tests/Notify/lib/EventChannel.cpp:
+
+          Added <create_colocated_ecf> method to created a colocated
+          EventChannelFactory.
+
+        * orbsvcs/tests/Notify/Lookup.h:
+        * orbsvcs/tests/Notify/Lookup.cpp:
+
+          Added resolve methods for
+          CosNotifyChannelAdmin::StructuredProxyPushSupplier_var and
+          CosNotifyChannelAdmin::StructuredProxyPushConsumer_var
+
+          Removed resolve methods for
+          CosNotifyComm::StructuredPushSupplier_var
+          CosNotifyComm::StructuredPushConsumer_var
+          as they are not required.
+
+        * orbsvcs/tests/Notify/lib/Notify_PushSupplier.h:
+        * orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h:
+        * orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h:
+        * orbsvcs/tests/Notify/lib/Notify_PushSupplier.h:
+        * orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h:
+        * orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h:
+
+          typedef to new implementation for backward compatibility.
+
+        * orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp:
+        * orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp:
+        * orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp:
+        * orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp:
+        * orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp:
+        * orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp:
+
+          Removed as they are obsoleted by the new implementaion.
+
+        * orbsvcs/tests/Notify/lib/Options_Parser.cpp:
+
+          Populate the revised definition of NotifyExt::ThreadPoolParams.
+
+        * orbsvcs/tests/Notify/lib/Periodic_Consumer.h:
+        * orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp:
+
+          - Changes to accomodate base class modifications.
+
+          - Note that the periodic consumer receives "warmup events" from
+          the periodic supplier . This helps us avoid huge spikes in
+          latency for the first few iterations of a test run.
+          - The periodic consumer recognizes a special "Stop" event that
+          hints that no event will be supplier now on.
+          - The periodic consumer can be asked to check if the priority of
+          the thread receiving the event is the same as the Priority field
+          in the event QoS.
+
+        * Periodic_Consumer_Command.h:
+        * Periodic_Consumer_Command.cpp:
+
+          Parses options to create a a "Relay" or "Direct" consumer.
+
+        * orbsvcs/tests/Notify/lib/Periodic_Supplier.h:
+        * orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp:
+
+          - Changes to accomodate base class modifications.
+
+          - The supplier can be asked to run for a fixed ammount of time
+          regardless of if it could send the number of events that we
+          asked it to send.
+
+        * orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h:
+        * orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp:
+
+          Parses options to create a "Direct" supplier.
+
+        * orbsvcs/tests/Notify/lib/Task_Stats.h:
+        * orbsvcs/tests/Notify/lib/Task_Stats.cpp:
+        * orbsvcs/tests/Notify/lib/Task_Stats.inl:
+
+          The square of the deviation in the sample set is calculated in the
+          <dump_stats> method. The <sample> method only records the sample
+          and does no more.
+
+        * orbsvcs/Notify_Service/Notify_Service.cpp:
+
+          By default, always run ORB.run() in a seperate thread that has the ORB sched
+          policies set on it.
+
+        * orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp:
+
+          The RT POA is created with the implicit activation policy.
+
+        * orbsvcs/tests/Notify/lib/Makefile:
+        * orbsvcs/tests/Notify/lib/Makefile.bor:
+        * orbsvcs/tests/Notify/RT_lib/Makefile:
+        * orbsvcs/tests/Notify/lib/Test_Filter:
+
+          Updated.
+
 Tue Jun 03 07:52:12 2003  Simon McQueen  <sm@prismtechnologies.com>
 
         * TAO version 1.3.2 released.
 
 Mon Jun  2 00:44:59 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* orbsvcs/orbsvcs/LifeCycleService.idl (LifeCycleService): Fixed 
-	  a stupid typo. Actually caught this a half an hour back but 
+	* orbsvcs/orbsvcs/LifeCycleService.idl (LifeCycleService): Fixed
+	  a stupid typo. Actually caught this a half an hour back but
 	  couldnt  get this into the repository.
 
 Mon Jun  2 00:25:39 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
@@ -15,7 +387,7 @@ Mon Jun  2 00:25:39 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 	  very good reasons) to get it right with explicit template
 	  instantiations. It is easy to fix the problem by changing the
 	  way the IDL's are specified. But we dont want to loose the
-	  structure of the exisiting IDL files in our test directories. 
+	  structure of the exisiting IDL files in our test directories.
 
 	  Once we have a nice way to handle these cases with explicit
 	  templates we can revert this. We will open up a bugzilla entry
@@ -44,8 +416,8 @@ Sun Jun 01 19:34:53 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 Sun Jun  1 10:08:40 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* examples/Simulator/Event_Supplier/Makefile: Updated 
-	  dependencies. 
+	* examples/Simulator/Event_Supplier/Makefile: Updated
+	  dependencies.
 
 Sat May 31 23:57:45 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
@@ -80,15 +452,15 @@ Fri May 30 13:56:33 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 	* Makefile: Added a new target 'releaseall'. Please see
 	  the entry "Fri May 30 13:52:49 2003  Balachandran Natarajan
 	  <bala@dre.vanderbilt.edu>" in $ACE_ROOT/ChangeLog  for the
-	  motivation. 
+	  motivation.
 
 Fri May 30 13:06:02 2003  Pradeep Gore  <pradeep@oomworks.com>
 
 	* orbsvcs/orbsvcs/Notify/RT_Notify_Service.h:
 	* orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp:
-	
+
 	  Overloaded base virtual <init> method to silence HPUX11 build warning.
-	
+
 Thu May 29 22:24:02 2003  Krishnakumar B  <kitty@spam.invalid.domain>
 
         * TAOACE.dsw:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
index 46b3d3c0ec2..9f5e56ece6d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
@@ -11,12 +11,12 @@ ACE_RCSID(Notify, TAO_NS_AdminProperties, "$id$")
 #include "orbsvcs/CosNotificationC.h"
 
 TAO_NS_AdminProperties::TAO_NS_AdminProperties (void)
-  : max_global_queue_length_ (CosNotification::MaxQueueLength, 0),
-    max_consumers_ (CosNotification::MaxConsumers, 0),
-    max_suppliers_ (CosNotification::MaxSuppliers, 0),
-    reject_new_events_ (CosNotification::RejectNewEvents, 0),
-    global_queue_length_ (0),
-    global_queue_not_full_condition_ (global_queue_lock_)
+  : max_global_queue_length_ (CosNotification::MaxQueueLength, 0)
+  , max_consumers_ (CosNotification::MaxConsumers, 0)
+  , max_suppliers_ (CosNotification::MaxSuppliers, 0)
+  , reject_new_events_ (CosNotification::RejectNewEvents, 0)
+  , global_queue_length_ (0)
+  , global_queue_not_full_condition_ (global_queue_lock_)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
index 4eaaa2555b9..bf16f89d514 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
@@ -11,77 +11,102 @@ ACE_RCSID(Notify, TAO_NS_AnyEvent, "$id$")
 #include "../Consumer.h"
 #include "tao/debug.h"
 
-TAO_NS_EventType TAO_NS_AnyEvent::event_type_;
+TAO_NS_EventType TAO_NS_AnyEvent_No_Copy::event_type_;
 
-TAO_NS_AnyEvent::TAO_NS_AnyEvent (const CORBA::Any &event)
-  : event_ (event)
+TAO_NS_AnyEvent_No_Copy::TAO_NS_AnyEvent_No_Copy (const CORBA::Any &event)
+  : event_ (&event)
 {
 }
 
-TAO_NS_AnyEvent::~TAO_NS_AnyEvent ()
+TAO_NS_AnyEvent_No_Copy::~TAO_NS_AnyEvent_No_Copy ()
+{
+}
+
+TAO_NS_Event*
+TAO_NS_AnyEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
 {
+  TAO_NS_Event* copy;
+
+  ACE_NEW_THROW_EX (copy,
+                    TAO_NS_AnyEvent (*this->event_),
+                    CORBA::NO_MEMORY ());
+
+  return copy;
 }
 
 const TAO_NS_EventType&
-TAO_NS_AnyEvent::type (void) const
+TAO_NS_AnyEvent_No_Copy::type (void) const
 {
   return this->event_type_;
 }
 
 void
-TAO_NS_AnyEvent::convert (CosNotification::StructuredEvent& notification)
+TAO_NS_AnyEvent_No_Copy::convert (CosNotification::StructuredEvent& notification) const
 {
-  TAO_NS_Event::translate (this->event_, notification);
+  TAO_NS_Event::translate (*this->event_, notification);
 }
 
 CORBA::Boolean
-TAO_NS_AnyEvent::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL)
+TAO_NS_AnyEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                 "TAO_Notify_AnyEvent::do_match ()\n"));
 
-  return filter->match(this->event_ ACE_ENV_ARG_PARAMETER);
+  return filter->match(*this->event_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_AnyEvent::push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const
+TAO_NS_AnyEvent_No_Copy::push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                 "TAO_Notify_AnyEvent::push \n"));
 
-  consumer->push (this->event_ ACE_ENV_ARG_PARAMETER);
+  consumer->push (*this->event_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_AnyEvent::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL)
+TAO_NS_AnyEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   CosNotification::StructuredEvent notification;
 
-  TAO_NS_Event::translate (this->event_, notification);
+  TAO_NS_Event::translate (*this->event_, notification);
 
   forwarder->forward_structured (notification ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_AnyEvent::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL)
+TAO_NS_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   CosNotification::StructuredEvent notification;
 
-  TAO_NS_Event::translate (this->event_, notification);
+  TAO_NS_Event::translate (*this->event_, notification);
 
   forwarder->forward_structured_no_filtering (notification ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_AnyEvent::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL)
+TAO_NS_AnyEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
-  forwarder->forward_any (this->event_ ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_any (*this->event_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_AnyEvent::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL)
+TAO_NS_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+{
+  forwarder->forward_any_no_filtering (*this->event_ ACE_ENV_ARG_PARAMETER);
+}
+
+/*****************************************************************************************************/
+
+TAO_NS_AnyEvent::TAO_NS_AnyEvent (const CORBA::Any &event)
+  : TAO_NS_AnyEvent_No_Copy (event)
+    , any_copy_ (event)
+{
+  this->event_ = &any_copy_;
+}
+
+TAO_NS_AnyEvent::~TAO_NS_AnyEvent ()
 {
-  forwarder->forward_any_no_filtering (this->event_ ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
index d77191e05b1..79896de3930 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
@@ -31,47 +31,72 @@ class TAO_NS_Consumer;
  * @brief
  *
  */
-class TAO_Notify_Export TAO_NS_AnyEvent : public TAO_NS_Event
+class TAO_Notify_Export TAO_NS_AnyEvent_No_Copy : public TAO_NS_Event
 {
   friend class TAO_NS_Builder;
 public:
   /// Constuctor
-  TAO_NS_AnyEvent (const CORBA::Any &event);
+  TAO_NS_AnyEvent_No_Copy (const CORBA::Any &event);
 
   /// Destructor
-  ~TAO_NS_AnyEvent ();
+  ~TAO_NS_AnyEvent_No_Copy ();
+
+  /// Copy the event.
+  virtual TAO_NS_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const;
 
   /// Get the event type.
   virtual const TAO_NS_EventType& type (void) const;
 
-  CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL);
+  CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const;
 
   /// Convert to CosNotification::Structured type
-  virtual void convert (CosNotification::StructuredEvent& notification);
+  virtual void convert (CosNotification::StructuredEvent& notification) const;
 
   /// Push event to consumer
   virtual void push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL);
+  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL);
+  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL);
+  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL);
+  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
 
 protected:
   /// Any Event
-  CORBA::Any event_;
+  const CORBA::Any* event_;
 
   /// Our event type.
   static TAO_NS_EventType event_type_;
 };
 
+/*****************************************************************************************************/
+
+/**
+ * @class TAO_NS_AnyEvent
+ *
+ * @brief AnyEvent implementation.
+ *
+ */
+class TAO_Notify_Export TAO_NS_AnyEvent : public TAO_NS_AnyEvent_No_Copy
+{
+public:
+  /// Constuctor
+  TAO_NS_AnyEvent (const CORBA::Any &event);
+
+  /// Destructor
+  ~TAO_NS_AnyEvent ();
+
+protected:
+  /// Copy of the Event.
+  CORBA::Any any_copy_;
+};
+
 #if defined (__ACE_INLINE__)
 #include "AnyEvent.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
index 92576ba0b82..ae3ae49ae8f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -10,6 +10,8 @@ ACE_RCSID(Notify, TAO_NS_CosEC_ProxyPushConsumer, "$id$")
 
 #include "tao/debug.h"
 #include "../AdminProperties.h"
+#include "../Method_Request_Lookup.h"
+#include "../Worker_Task.h"
 #include "AnyEvent.h"
 #include "PushSupplier.h"
 
@@ -48,7 +50,7 @@ TAO_NS_CosEC_ProxyPushConsumer::push (TAO_NS_Event_var &/*event*/)
 }
 
 void
-TAO_NS_CosEC_ProxyPushConsumer::push (const CORBA::Any& data ACE_ENV_ARG_DECL)
+TAO_NS_CosEC_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -64,11 +66,11 @@ TAO_NS_CosEC_ProxyPushConsumer::push (const CORBA::Any& data ACE_ENV_ARG_DECL)
       ACE_THROW (CosEventComm::Disconnected ());
     }
 
-  // Convert
-  TAO_NS_Event_var event (new TAO_NS_AnyEvent (data));
+  TAO_NS_AnyEvent_No_Copy event (any);
 
-  // Continue processing.
-  this->TAO_NS_ProxyConsumer::push (event);
+  TAO_NS_Method_Request_Lookup_No_Copy request (&event, this);
+
+  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
index d09f50987a7..f2d774756b8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -10,6 +10,8 @@ ACE_RCSID(Notify, TAO_NS_ProxyPushConsumer, "$id$")
 
 #include "tao/debug.h"
 #include "../AdminProperties.h"
+#include "../Method_Request_Lookup.h"
+#include "../Worker_Task.h"
 #include "AnyEvent.h"
 #include "PushSupplier.h"
 
@@ -60,7 +62,7 @@ TAO_NS_ProxyPushConsumer::push (TAO_NS_Event_var &/*event*/)
 }
 
 void
-TAO_NS_ProxyPushConsumer::push (const CORBA::Any& data ACE_ENV_ARG_DECL)
+TAO_NS_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -76,11 +78,11 @@ TAO_NS_ProxyPushConsumer::push (const CORBA::Any& data ACE_ENV_ARG_DECL)
       ACE_THROW (CosEventComm::Disconnected ());
     }
 
-  // Convert
-  TAO_NS_Event_var event (new TAO_NS_AnyEvent (data));
+  TAO_NS_AnyEvent_No_Copy event (any);
 
-  // Continue processing.
-  this->TAO_NS_ProxyConsumer::push (event);
+  TAO_NS_Method_Request_Lookup_No_Copy request (&event, this);
+
+  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index ec6b2298fac..7a5b5d32d8d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -46,6 +46,12 @@ TAO_NS_PushConsumer::release (void)
 }
 
 void
+TAO_NS_PushConsumer::push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+{
+  event->push (this ACE_ENV_ARG_PARAMETER);
+}
+
+void
 TAO_NS_PushConsumer::push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL)
 {
   event->push (this ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
index 7a3d5c7ed39..a5fbd384a91 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
@@ -44,7 +44,10 @@ public:
   virtual void release (void);
 
   /// Push <event> to this consumer.
-  void push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  virtual void push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+
+  /// Push <event> to this consumer.
+  virtual void push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
   virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index 2210c3ca7ad..f5b1f5318d0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -30,39 +30,7 @@ TAO_NS_Consumer::proxy (void)
 }
 
 void
-TAO_NS_Consumer::push (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
-{
-  if (this->is_suspended_ == 1) // If we're suspended, queue for later delivery.
-    {
-      ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock ());
-      this->event_collection_->enqueue_head (event);
-
-      return;
-    }
-
-  ACE_TRY
-    {
-      this->push_i (event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_exist)
-    {
-      this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-}
-
-void
-TAO_NS_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_NS_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->is_suspended_ == 1)
     return; // Do nothing if we're suspended.
@@ -83,7 +51,7 @@ TAO_NS_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     {
       if (event_collection_copy.dequeue_head (event) == 0)
         {
-          proxy_supplier->push_no_filtering (event);
+          proxy_supplier->push_no_filtering (event ACE_ENV_ARG_PARAMETER);
         }
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index 9537e8f3398..f0d3ec1a54f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -49,6 +49,9 @@ public:
   virtual TAO_NS_Proxy* proxy (void);
 
   /// Push <event> to this consumer.
+  void push (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+
+  /// Push <event> to this consumer.
   void push (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
@@ -76,6 +79,9 @@ protected:
                                    ACE_ENV_ARG_DECL);
 
   /// Push Implementation.
+  virtual void push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL) = 0;
+
+  /// Push Implementation.
   virtual void push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL) = 0;
 
   /// Get the shared Proxy Lock
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
index d2a5a104c85..9c5c391e6f9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
@@ -25,3 +25,72 @@ TAO_NS_Consumer::suspend (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->is_suspended_ = 1;
 }
+
+ACE_INLINE void
+TAO_NS_Consumer::push (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
+{
+  if (this->is_suspended_ == 1) // If we're suspended, queue for later delivery.
+    {
+      ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock ());
+
+      this->event_collection_->enqueue_head (event);
+
+      return;
+    }
+
+  ACE_TRY
+    {
+      this->push_i (event ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_exist)
+    {
+      this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CORBA::SystemException, sysex)
+    {
+      this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+}
+
+ACE_INLINE void
+TAO_NS_Consumer::push (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+{
+  if (this->is_suspended_ == 1) // If we're suspended, queue for later delivery.
+    {
+      ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock ());
+
+      TAO_NS_Event* event_copy = event->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      TAO_NS_Event_Copy_var event_var (event_copy);
+
+      this->event_collection_->enqueue_head (event_var);
+
+      return;
+    }
+
+  ACE_TRY
+    {
+      this->push_i (event ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_exist)
+    {
+      this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CORBA::SystemException, sysex)
+    {
+      this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index 1e0a7cccacd..9c04880fc63 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -145,7 +145,7 @@ void
 TAO_CosNotify_Service::set_threads (CosNotification::QoSProperties &qos, int threads)
 {
   NotifyExt::ThreadPoolParams tp_params =
-    {0, (unsigned)threads, 0, 0, 0, 0, 0 };
+    {NotifyExt::CLIENT_PROPAGATED, 0, 0, (unsigned)threads, 0, 0, 0, 0, 0 };
 
   qos.length (1);
   qos[0].name = CORBA::string_dup (NotifyExt::ThreadPool);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
index d19978437d2..cde5a019832 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
@@ -15,14 +15,14 @@ TAO_NS_Event::TAO_NS_Event (void)
   :priority_ (CosNotification::Priority, CosNotification::DefaultPriority),
    timeout_ (CosNotification::Timeout)
 {
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,"event:%x  created\n", this ));
+  //  if (TAO_debug_level > 0)
+  //  ACE_DEBUG ((LM_DEBUG,"event:%x  created\n", this ));
 }
 
 TAO_NS_Event::~TAO_NS_Event ()
 {
-  if (TAO_debug_level > 1)
-    ACE_DEBUG ((LM_DEBUG,"event:%x  destroyed\n", this ));
+  // if (TAO_debug_level > 1)
+  //  ACE_DEBUG ((LM_DEBUG,"event:%x  destroyed\n", this ));
 }
 
 void
@@ -40,7 +40,19 @@ TAO_NS_Event::translate (const CosNotification::StructuredEvent& notification, C
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
 template class ACE_Auto_Basic_Ptr<TAO_NS_Event>;
+template class ACE_Refcounted_Auto_Ptr<const TAO_NS_Event, TAO_SYNCH_MUTEX>;
+template class ACE_Unbounded_Queue<TAO_NS_Event_var>;
+template class ACE_Node<TAO_NS_Event_var>;
+template class ACE_Unbounded_Queue_Iterator<TAO_NS_Event_var>;
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_NS_Event>
+#pragma instantiate ACE_Refcounted_Auto_Ptr<const TAO_NS_Event, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Unbounded_Queue<TAO_NS_Event_var>
+#pragma instantiate ACE_Node<TAO_NS_Event_var>
+#pragma instantiate ACE_Unbounded_Queue_Iterator<TAO_NS_Event_var>
+
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h
index bbe45c870e3..c232eb8bafb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h
@@ -20,6 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Copy_Disabled.h"
+#include "ace/Refcounted_Auto_Ptr.h"
 #include "orbsvcs/Event_ForwarderS.h"
 #include "orbsvcs/CosNotifyFilterC.h"
 #include "orbsvcs/CosNotificationC.h"
@@ -44,6 +45,9 @@ public:
   /// Destructor
   virtual ~TAO_NS_Event ();
 
+  /// Copy the event.
+  virtual TAO_NS_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const = 0;
+
   /// Translate Any to Structured
   static void translate (const CORBA::Any& any, CosNotification::StructuredEvent& notification);
 
@@ -54,32 +58,32 @@ public:
   virtual const TAO_NS_EventType& type (void) const = 0;
 
   /// Returns true if the filter matches.
-  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) = 0;
+  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const = 0;
 
   /// Convert to CosNotification::Structured type
-  virtual void convert (CosNotification::StructuredEvent& notification) = 0;
+  virtual void convert (CosNotification::StructuredEvent& notification) const = 0;
 
   /// Push event to consumer
   virtual void push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const = 0;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) = 0;
+  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) = 0;
+  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) = 0;
+  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) = 0;
+  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
 
   ///= Accessors
   /// Priority
-  TAO_NS_Property_Short& priority (void);
+  const TAO_NS_Property_Short& priority (void) const;
 
   /// Timeout
-  TAO_NS_Property_Time& timeout (void);
+  const TAO_NS_Property_Time& timeout (void) const;
 
 protected:
   /// = QoS properties
@@ -91,9 +95,41 @@ protected:
   TAO_NS_Property_Time timeout_;
 };
 
-template <class X, class ACE_LOCK> class ACE_Refcounted_Auto_Ptr;
-template <class T> class ACE_Unbounded_Queue;
-typedef ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX> TAO_NS_Event_var;
+typedef ACE_Refcounted_Auto_Ptr<const TAO_NS_Event, TAO_SYNCH_MUTEX> TAO_NS_Event_var_Base;
+
+/**
+ * @class TAO_NS_Event_var
+ *
+ * @brief A Non-Copy version of the ACE_Refcounted_Auto_Ptr that hides the constructors.
+ *
+ */
+class TAO_NS_Event_var : public TAO_NS_Event_var_Base
+{
+public:
+  /// Default Constructor
+  TAO_NS_Event_var (void);
+
+protected:
+  /// Constructor
+  TAO_NS_Event_var (TAO_NS_Event* event);
+};
+
+/**
+ * @class TAO_NS_Event
+ *
+ * @brief A version of the ACE_Refcounted_Auto_Ptr that allows construction from a TAO_NS_Event
+ *
+ */
+class TAO_NS_Event_Copy_var : public TAO_NS_Event_var
+{
+public:
+  /// Default Constructor
+  TAO_NS_Event_Copy_var (void);
+
+  /// Constructor
+  TAO_NS_Event_Copy_var (TAO_NS_Event* event);
+};
+
 typedef ACE_Unbounded_Queue<TAO_NS_Event_var> TAO_NS_Event_Collection;
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.inl b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
index 019194c78aa..fa6f0bb9622 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
@@ -1,13 +1,41 @@
 // $Id$
 
-ACE_INLINE TAO_NS_Property_Short&
-TAO_NS_Event::priority (void)
+ACE_INLINE const TAO_NS_Property_Short&
+TAO_NS_Event::priority (void) const
 {
   return this->priority_;
 }
 
-ACE_INLINE TAO_NS_Property_Time&
-TAO_NS_Event::timeout (void)
+ACE_INLINE const TAO_NS_Property_Time&
+TAO_NS_Event::timeout (void) const
 {
   return this->timeout_;
 }
+
+/**********************************************************/
+
+ACE_INLINE
+TAO_NS_Event_var::TAO_NS_Event_var (void)
+  : TAO_NS_Event_var_Base ()
+{
+}
+
+ACE_INLINE
+TAO_NS_Event_var::TAO_NS_Event_var (TAO_NS_Event* event)
+  : TAO_NS_Event_var_Base (event)
+{
+}
+
+/**********************************************************/
+
+ACE_INLINE
+TAO_NS_Event_Copy_var::TAO_NS_Event_Copy_var (void)
+  : TAO_NS_Event_var ()
+{
+}
+
+ACE_INLINE
+TAO_NS_Event_Copy_var::TAO_NS_Event_Copy_var (TAO_NS_Event* event)
+  : TAO_NS_Event_var (event)
+{
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
index f6c983d44dd..5268f76e2b3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
@@ -1,10 +1,15 @@
 /* -*- C++ -*- $Id$ */
 
 #include "FilterAdmin.h"
-#include "ace/Refcounted_Auto_Ptr.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "FilterAdmin.inl"
+#endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, FilterAdmin, "$Id$")
 
+#include "ace/Refcounted_Auto_Ptr.h"
+
 // Implementation skeleton constructor
 TAO_NS_FilterAdmin::TAO_NS_FilterAdmin (void)
 {
@@ -15,38 +20,6 @@ TAO_NS_FilterAdmin::~TAO_NS_FilterAdmin (void)
 {
 }
 
-CORBA::Boolean
-TAO_NS_FilterAdmin::match (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotifyFilter::UnsupportedFilterableData
-                   ))
-{
-  ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-
-  // If no filter is active, match is successfull.
-  if (this->filter_list_.current_size () == 0)
-    return 1;
-
-  // We want to return true if atleast one constraint matches.
-  FILTER_LIST::ITERATOR iter (this->filter_list_);
-  FILTER_LIST::ENTRY *entry;
-  CORBA::Boolean ret_val = 0;
-
-  for (; iter.next (entry); iter.advance ())
-    {
-      ret_val = event->do_match (entry->int_id_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (ret_val == 1)
-        return 1;
-    }
-
-  return 0;
-}
-
 CosNotifyFilter::FilterID
 TAO_NS_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index c994127e013..9c0c2a52d3f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -43,6 +43,14 @@ class TAO_Notify_Export TAO_NS_FilterAdmin
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
+  // = match operation on all the filters
+  /// See if any of the filters match.
+  CORBA::Boolean match (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException,
+                     CosNotifyFilter::UnsupportedFilterableData
+                     ));
+
   virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -81,5 +89,9 @@ class TAO_Notify_Export TAO_NS_FilterAdmin
   TAO_NS_ID_Factory filter_ids_;
 };
 
+#if defined (__ACE_INLINE__)
+#include "FilterAdmin.inl"
+#endif /* __ACE_INLINE__ */
+
 #include "ace/post.h"
 #endif /* NOTIFY_FILTERADMIN_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
new file mode 100644
index 00000000000..a8c46da4aa6
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
@@ -0,0 +1,33 @@
+//$Id$
+
+ACE_INLINE CORBA::Boolean
+TAO_NS_FilterAdmin::match (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((
+                   CORBA::SystemException,
+                   CosNotifyFilter::UnsupportedFilterableData
+                   ))
+{
+  ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
+                      CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
+  // If no filter is active, match is successfull.
+  if (this->filter_list_.current_size () == 0)
+    return 1;
+
+  // We want to return true if atleast one constraint matches.
+  FILTER_LIST::ITERATOR iter (this->filter_list_);
+  FILTER_LIST::ENTRY *entry;
+  CORBA::Boolean ret_val = 0;
+
+  for (; iter.next (entry); iter.advance ())
+    {
+      ret_val = event->do_match (entry->int_id_.in () ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      if (ret_val == 1)
+        return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
index d300a7b666e..5744f534186 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
@@ -7,64 +7,3 @@
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, TAO_NS_Method_Request, "$Id$")
-
-TAO_NS_Method_Request_Event::TAO_NS_Method_Request_Event (const TAO_NS_Event_var& event)
-  :event_ (event)
-{
-  // Set the parameters that affect queuing in the message queue.
-  // The ACE_Message_Block priorities go from 0 (lowest) to ULONG_MAX
-  // (highest), while the Notification Events go from -32767 (lowest,
-  // even though CORBA::Short goes to -32768) to 32767 (highest).
-
-  // Convert to CORBA::Long to preserve the sign.  Conversion to
-  // unsigned long will happen automatically and we do not have to worry
-  // about losing the number in the addition since priority () returns a
-  // CORBA::Short.
-  this->msg_priority ((CORBA::Long)this->event_->priority ().value () +
-                      PRIORITY_BASE);
-
-  // The deadline time for the message block is absolute, while the
-  // timeout for the event is relative to the time it was received.
-  // So, we do a little conversion and set it on the message block (us)
-
-  TAO_NS_Property_Time& timeout = this->event_->timeout ();
-
-  if (timeout.is_valid () && timeout != 0)
-    {
-      // I am multiplying timeout () by 1 because it returns a
-      // CORBA::ULongLong, which on some platforms doesn't automatically
-      // convert to the long that the ACE_Time_Value expects.  The /
-      // operator returns a 32-bit integer.
-      ACE_Time_Value current = ACE_OS::gettimeofday () +
-# if defined (ACE_CONFIG_WIN32_H)
-        ACE_Time_Value (
-                        ACE_static_cast (long,
-                                         timeout.value ()));
-# else
-      ACE_Time_Value (timeout.value () / 1);
-# endif /* ACE_CONFIG_WIN32_H */
-      this->msg_deadline_time (current);
-    }
-}
-
-TAO_NS_Method_Request_Event::~TAO_NS_Method_Request_Event ()
-{
-}
-
-int
-TAO_NS_Method_Request_Event::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  return -1;
-}
-
-TAO_NS_Method_Request*
-TAO_NS_Method_Request_Event::copy (void)
-{
-  return new TAO_NS_Method_Request_Event (this->event_);
-}
-
-const TAO_NS_Event_var&
-TAO_NS_Method_Request_Event::event (void)
-{
-  return this->event_;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
index 4124b82b21e..3f1f404e823 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
@@ -23,55 +23,43 @@
 #include "ace/Refcounted_Auto_Ptr.h"
 #include "Event.h"
 
+class TAO_NS_Method_Request;
+
 /**
- * @class TAO_NS_Method_Request
+ * @class TAO_NS_Method_Request_No_Copy
  *
- * @brief Interface for NS method Requests
+ * @brief Base class for Method Requests that do not copy the event.
  *
  */
-class TAO_Notify_Export TAO_NS_Method_Request : public ACE_Message_Block
+class TAO_Notify_Export TAO_NS_Method_Request_No_Copy
 {
 public:
-  enum {PRIORITY_BASE = 32768};
-
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL) = 0;
 
   /// Create a copy of this object.
-  virtual TAO_NS_Method_Request* copy (void) = 0;
+  virtual TAO_NS_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL) = 0;
 };
 
 /***********************************************************************/
 
 /**
- * @class TAO_NS_Method_Request_Event
+ * @class TAO_NS_Method_Request
  *
- * @brief Base class for NS method Requests on Events.
+ * @brief Interface for NS method Requests
  *
  */
-class TAO_Notify_Export TAO_NS_Method_Request_Event : public TAO_NS_Method_Request
+class TAO_Notify_Export TAO_NS_Method_Request : public ACE_Message_Block
 {
 public:
-  /// Constuctor
-  TAO_NS_Method_Request_Event (const TAO_NS_Event_var& event);
+  enum {PRIORITY_BASE = 32768};
 
-  /// Destructor
-  virtual ~TAO_NS_Method_Request_Event ();
+  void init (const TAO_NS_Event_var& event);
 
   /// Execute the Request
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Create a copy of this object.
-  virtual TAO_NS_Method_Request* copy (void);
-
-  /// Obtain the event.
-  const TAO_NS_Event_var& event (void);
-
-protected:
-  const TAO_NS_Event_var event_;
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL) = 0;
 };
 
-
 #if defined (__ACE_INLINE__)
 #include "Method_Request.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl
index cfa1da318d3..e015902690b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl
@@ -1 +1,40 @@
 // $Id$
+
+ACE_INLINE void
+TAO_NS_Method_Request::init (const TAO_NS_Event_var& event)
+{
+  // Set the parameters that affect queuing in the message queue.
+  // The ACE_Message_Block priorities go from 0 (lowest) to ULONG_MAX
+  // (highest), while the Notification Events go from -32767 (lowest,
+  // even though CORBA::Short goes to -32768) to 32767 (highest).
+
+  // Convert to CORBA::Long to preserve the sign.  Conversion to
+  // unsigned long will happen automatically and we do not have to worry
+  // about losing the number in the addition since priority () returns a
+  // CORBA::Short.
+  this->msg_priority ((CORBA::Long)event->priority ().value () +
+                      PRIORITY_BASE);
+
+  // The deadline time for the message block is absolute, while the
+  // timeout for the event is relative to the time it was received.
+  // So, we do a little conversion and set it on the message block (us)
+
+  const TAO_NS_Property_Time& timeout = event->timeout ();
+
+  if (timeout.is_valid () && timeout != 0)
+    {
+      // I am multiplying timeout () by 1 because it returns a
+      // CORBA::ULongLong, which on some platforms doesn't automatically
+      // convert to the long that the ACE_Time_Value expects.  The /
+      // operator returns a 32-bit integer.
+      ACE_Time_Value current = ACE_OS::gettimeofday () +
+# if defined (ACE_CONFIG_WIN32_H)
+        ACE_Time_Value (
+                        ACE_static_cast (long,
+                                         timeout.value ()));
+# else
+      ACE_Time_Value (timeout.value () / 1);
+# endif /* ACE_CONFIG_WIN32_H */
+      this->msg_deadline_time (current);
+    }
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index 88a442aabbd..f52cc1f11a0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -14,58 +14,119 @@ ACE_RCSID(Notify, TAO_NS_Method_Request_Dispatch, "$Id$")
 #include "Admin.h"
 #include "ConsumerAdmin.h"
 
-TAO_NS_Method_Request_Dispatch::TAO_NS_Method_Request_Dispatch (const TAO_NS_Event_var& event, TAO_NS_ProxySupplier* proxy_supplier)
-  : TAO_NS_Method_Request_Event (event), proxy_supplier_ (proxy_supplier), refcountable_guard_ (*proxy_supplier)
+TAO_NS_Method_Request_Dispatch::TAO_NS_Method_Request_Dispatch (const TAO_NS_Event_var& event, TAO_NS_ProxySupplier* proxy_supplier, CORBA::Boolean filtering)
+  : TAO_NS_Method_Request_Dispatch_Base (event, proxy_supplier, filtering)
 {
+  this->init (event);
 }
 
 TAO_NS_Method_Request_Dispatch::~TAO_NS_Method_Request_Dispatch ()
 {
 }
 
+int
+TAO_NS_Method_Request_Dispatch::execute (ACE_ENV_SINGLE_ARG_DECL)
+{
+  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+/*********************************************************************************************************/
+
+TAO_NS_Method_Request_Dispatch_No_Copy::TAO_NS_Method_Request_Dispatch_No_Copy (const TAO_NS_Event* event, TAO_NS_ProxySupplier* proxy_supplier, CORBA::Boolean filtering)
+  : TAO_NS_Method_Request_Dispatch_No_Copy_Base (event, proxy_supplier, filtering)
+{
+}
+
+TAO_NS_Method_Request_Dispatch_No_Copy:: ~TAO_NS_Method_Request_Dispatch_No_Copy ()
+{
+}
+
+int
+TAO_NS_Method_Request_Dispatch_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
+{
+  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
 TAO_NS_Method_Request*
-TAO_NS_Method_Request_Dispatch::copy (void)
+TAO_NS_Method_Request_Dispatch_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
+{
+  TAO_NS_Method_Request* request;
+
+  TAO_NS_Event* event_copy = this->event_->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  TAO_NS_Event_Copy_var event_var (event_copy);
+
+  ACE_NEW_THROW_EX (request,
+                    TAO_NS_Method_Request_Dispatch (event_var, this->proxy_supplier_, this->filtering_),
+                    CORBA::INTERNAL ());
+
+  return request;
+}
+
+/*********************************************************************************************************/
+
+TAO_NS_Method_Request_Dispatch_No_Copy_Ex::TAO_NS_Method_Request_Dispatch_No_Copy_Ex (const TAO_NS_Event_var& event, TAO_NS_ProxySupplier* proxy_supplier, CORBA::Boolean filtering)
+  : TAO_NS_Method_Request_Dispatch_No_Copy_Ex_Base (event, proxy_supplier, filtering)
+{
+}
+
+TAO_NS_Method_Request_Dispatch_No_Copy_Ex:: ~TAO_NS_Method_Request_Dispatch_No_Copy_Ex ()
 {
-  /// @@use factory
-  return new TAO_NS_Method_Request_Dispatch (this->event_, this->proxy_supplier_);
 }
 
 int
-TAO_NS_Method_Request_Dispatch::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NS_Method_Request_Dispatch_No_Copy_Ex::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->proxy_supplier_->has_shutdown ())
-    return 0; // If we were shutdown while waiting in the queue, return with no action.
-
-  TAO_NS_Admin* parent = this->proxy_supplier_->consumer_admin ();
-
-  CORBA::Boolean val =  this->proxy_supplier_->check_filters (this->event_,
-                                                              parent->filter_admin (),
-                                                              parent->filter_operator ()
-                                                              ACE_ENV_ARG_PARAMETER);
-
-  if (TAO_debug_level > 1)
-    ACE_DEBUG ((LM_DEBUG, "Proxysupplier %x filter eval result = %d",this->proxy_supplier_ , val));
-
-  // Filter failed - do nothing.
-  if (val == 0)
-    return 0;
-
-  ACE_TRY
-    {
-      TAO_NS_Consumer* consumer = this->proxy_supplier_->consumer ();
-
-      if (consumer != 0)
-        {
-          consumer->push (this->event_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_NS_Method_Request_Dispatch::: error sending event. \n ");
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+TAO_NS_Method_Request*
+TAO_NS_Method_Request_Dispatch_No_Copy_Ex::copy (ACE_ENV_SINGLE_ARG_DECL)
+{
+  TAO_NS_Method_Request* request;
+
+  ACE_NEW_THROW_EX (request,
+                    TAO_NS_Method_Request_Dispatch (this->event_, this->proxy_supplier_, this->filtering_),
+                    CORBA::INTERNAL ());
+
+  return request;
 }
+
+
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event_var
+, TAO_NS_ProxySupplier_Guard
+, const TAO_NS_Event_var&
+, TAO_NS_ProxySupplier*>;
+
+template class TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event*
+, TAO_NS_ProxySupplier*
+, const TAO_NS_Event*
+, TAO_NS_ProxySupplier*>;
+
+template class TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event_var&
+, TAO_NS_ProxySupplier*
+, const TAO_NS_Event_var&
+, TAO_NS_ProxySupplier*>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event_var
+, TAO_NS_ProxySupplier_Guard
+, const TAO_NS_Event_var&
+, TAO_NS_ProxySupplier*>
+
+#pragma instantiate TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event*
+, TAO_NS_ProxySupplier*
+, const TAO_NS_Event*
+, TAO_NS_ProxySupplier*>
+
+#pragma instantiate TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event_var&
+, TAO_NS_ProxySupplier*
+, const TAO_NS_Event_var&
+, TAO_NS_ProxySupplier*>
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
index 862608c46a3..3b484b4c891 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
@@ -21,8 +21,8 @@
 
 #include "Method_Request.h"
 #include "Refcountable.h"
-
-class TAO_NS_ProxySupplier;
+#include "Method_Request_Dispatch_T.h"
+#include "ProxySupplier.h"
 
 /**
  * @class TAO_NS_Method_Request_Dispatch
@@ -30,27 +30,86 @@ class TAO_NS_ProxySupplier;
  * @brief Dispatchs an event to a proxy supplier.
  *
  */
-class TAO_Notify_Export TAO_NS_Method_Request_Dispatch  : public TAO_NS_Method_Request_Event
+
+typedef TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event_var
+                                         , TAO_NS_ProxySupplier_Guard
+                                         , const TAO_NS_Event_var&
+                                         , TAO_NS_ProxySupplier*>  TAO_NS_Method_Request_Dispatch_Base;
+
+class TAO_Notify_Export TAO_NS_Method_Request_Dispatch : public TAO_NS_Method_Request_Dispatch_Base
+                                                       , public TAO_NS_Method_Request
 {
 public:
   /// Constuctor
-  TAO_NS_Method_Request_Dispatch (const TAO_NS_Event_var& event, TAO_NS_ProxySupplier* proxy_supplier);
+  TAO_NS_Method_Request_Dispatch (const TAO_NS_Event_var& event, TAO_NS_ProxySupplier* proxy_supplier, CORBA::Boolean filtering);
 
   /// Destructor
   ~TAO_NS_Method_Request_Dispatch ();
 
-  /// Create a copy of this object.
-  TAO_NS_Method_Request* copy (void);
+  /// Execute the Request
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+};
+
+/*******************************************************************************************************/
+
+/**
+ * @class TAO_NS_Method_Request_Dispatch_No_Copy
+ *
+ * @brief Dispatchs an event to a proxy supplier.
+ *
+ */
+
+typedef TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event*
+                                         , TAO_NS_ProxySupplier*
+                                         , const TAO_NS_Event*
+                                         , TAO_NS_ProxySupplier*>  TAO_NS_Method_Request_Dispatch_No_Copy_Base;
+
+class TAO_Notify_Export TAO_NS_Method_Request_Dispatch_No_Copy : public TAO_NS_Method_Request_Dispatch_No_Copy_Base
+                                                                 , public TAO_NS_Method_Request_No_Copy
+{
+public:
+  /// Constuctor
+  TAO_NS_Method_Request_Dispatch_No_Copy (const TAO_NS_Event* event, TAO_NS_ProxySupplier* proxy_supplier, CORBA::Boolean filtering);
+
+  /// Destructor
+  ~TAO_NS_Method_Request_Dispatch_No_Copy ();
 
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 
-private:
-  /// Proxy Supplier that we use.
-  TAO_NS_ProxySupplier* proxy_supplier_;
+  /// Create a copy of this object.
+  virtual TAO_NS_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
+};
+
+/*******************************************************************************************************/
+
+/**
+ * @class TAO_NS_Method_Request_Dispatch_No_Copy_Ex
+ *
+ * @brief Dispatchs an event to a proxy supplier.
+ *
+ */
+
+typedef TAO_NS_Method_Request_Dispatch_T<const TAO_NS_Event_var&
+                                         , TAO_NS_ProxySupplier*
+                                         , const TAO_NS_Event_var&
+                                         , TAO_NS_ProxySupplier*>  TAO_NS_Method_Request_Dispatch_No_Copy_Ex_Base;
 
-  /// Guard to automatically inc/decr ref count on the proxy.
-  TAO_NS_Refcountable_Guard refcountable_guard_;
+class TAO_Notify_Export TAO_NS_Method_Request_Dispatch_No_Copy_Ex : public TAO_NS_Method_Request_Dispatch_No_Copy_Ex_Base
+                                                                 , public TAO_NS_Method_Request_No_Copy
+{
+public:
+  /// Constuctor
+  TAO_NS_Method_Request_Dispatch_No_Copy_Ex (const TAO_NS_Event_var& event, TAO_NS_ProxySupplier* proxy_supplier, CORBA::Boolean filtering);
+
+  /// Destructor
+  ~TAO_NS_Method_Request_Dispatch_No_Copy_Ex ();
+
+  /// Execute the Request
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+
+  /// Create a copy of this object.
+  virtual TAO_NS_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.cpp
new file mode 100644
index 00000000000..07a8a2b78d4
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.cpp
@@ -0,0 +1,24 @@
+// $Id$
+#ifndef TAO_NS_Method_Request_Dispatch_T_CPP
+#define TAO_NS_Method_Request_Dispatch_T_CPP
+
+#include "Method_Request_Dispatch_T.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "Method_Request_Dispatch_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(Notify, TAO_NS_Method_Request_Dispatch_T, "$id$")
+
+template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
+TAO_NS_Method_Request_Dispatch_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::TAO_NS_Method_Request_Dispatch_T (EVENT_PARAM event, PROXY_PARAM proxy_supplier, CORBA::Boolean filtering)
+  :event_ (event), proxy_supplier_ (proxy_supplier), filtering_ (filtering)
+{
+}
+
+template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
+TAO_NS_Method_Request_Dispatch_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::~TAO_NS_Method_Request_Dispatch_T ()
+{
+}
+
+#endif /* TAO_NS_Method_Request_Dispatch_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h
new file mode 100644
index 00000000000..48a5582db50
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h
@@ -0,0 +1,67 @@
+/* -*- C++ -*- */
+/**
+ *  @file Method_Request_Dispatch_T.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_METHOD_REQUEST_DISPATCH_T_H
+#define TAO_NS_METHOD_REQUEST_DISPATCH_T_H
+#include "ace/pre.h"
+
+#include "notify_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/corba.h"
+
+/**
+ * @class TAO_NS_Method_Request_Dispatch_T
+ *
+ * @brief
+ *
+ */
+template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
+class TAO_Notify_Export TAO_NS_Method_Request_Dispatch_T
+{
+public:
+  /// Constuctor
+  TAO_NS_Method_Request_Dispatch_T (EVENT_PARAM event, PROXY_PARAM proxy, CORBA::Boolean filtering);
+
+  /// Destructor
+  virtual ~TAO_NS_Method_Request_Dispatch_T ();
+
+  /// Execute the dispatch operation.
+  int execute_i (ACE_ENV_SINGLE_ARG_DECL);
+
+protected:
+  /// The Event
+  EVENT event_;
+
+  /// The Proxy
+  PROXY proxy_supplier_;
+
+  /// Flag is true if we want to do fintering else false.
+  CORBA::Boolean filtering_;
+};
+
+#if defined (__ACE_INLINE__)
+#include "Method_Request_Dispatch_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Method_Request_Dispatch_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Method_Request_Dispatch_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+#endif /* TAO_NS_METHOD_REQUEST_DISPATCH_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl
new file mode 100644
index 00000000000..0ca8a208db9
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl
@@ -0,0 +1,46 @@
+// $Id$
+
+#include "Admin.h"
+
+template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM> ACE_INLINE int
+TAO_NS_Method_Request_Dispatch_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+{
+  if (this->proxy_supplier_->has_shutdown ())
+    return 0; // If we were shutdown while waiting in the queue, return with no action.
+
+  if (this->filtering_ == 1)
+    {
+      TAO_NS_Admin* parent = this->proxy_supplier_->consumer_admin ();
+
+      CORBA::Boolean val =  this->proxy_supplier_->check_filters (this->event_,
+                                                                  parent->filter_admin (),
+                                                                  parent->filter_operator ()
+                                                                  ACE_ENV_ARG_PARAMETER);
+
+      if (TAO_debug_level > 1)
+        ACE_DEBUG ((LM_DEBUG, "Proxysupplier %x filter eval result = %d",&this->proxy_supplier_ , val));
+
+      // Filter failed - do nothing.
+      if (val == 0)
+        return 0;
+    }
+
+  ACE_TRY
+    {
+      TAO_NS_Consumer* consumer = this->proxy_supplier_->consumer ();
+
+      if (consumer != 0)
+        {
+          consumer->push (this->event_ ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      if (TAO_debug_level > 0)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_NS_Method_Request_Dispatch::: error sending event. \n ");
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
new file mode 100644
index 00000000000..37445904795
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
@@ -0,0 +1,30 @@
+// $Id$
+
+#include "Method_Request_Event.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "Method_Request_Event.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(Notify, TAO_NS_Method_Request_Event, "$id$")
+
+TAO_NS_Method_Request_Event::TAO_NS_Method_Request_Event (const TAO_NS_Event_var& event)
+  :event_ (event)
+{
+  this->init (event);
+}
+
+TAO_NS_Method_Request_Event::~TAO_NS_Method_Request_Event ()
+{
+}
+int
+TAO_NS_Method_Request_Event::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+{
+  return -1;
+}
+
+const TAO_NS_Event_var&
+TAO_NS_Method_Request_Event::event (void)
+{
+  return this->event_;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
new file mode 100644
index 00000000000..7ed65552474
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
@@ -0,0 +1,55 @@
+/* -*- C++ -*- */
+/**
+ *  @file Method_Request_Event.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_METHOD_REQUEST_EVENT_H
+#define TAO_NS_METHOD_REQUEST_EVENT_H
+#include "ace/pre.h"
+
+#include "notify_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Method_Request.h"
+
+/**
+ * @class TAO_NS_Method_Request_Event
+ *
+ * @brief A method request for storing events.
+ *
+ */
+class TAO_Notify_Export TAO_NS_Method_Request_Event : public TAO_NS_Method_Request
+{
+public:
+  /// Constuctor
+  TAO_NS_Method_Request_Event (const TAO_NS_Event_var& event);
+
+  /// Destructor
+  virtual ~TAO_NS_Method_Request_Event ();
+
+  /// Execute the Request
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+
+  /// Obtain the event.
+  const TAO_NS_Event_var& event (void);
+
+protected:
+  /// The event.
+  const TAO_NS_Event_var event_;
+};
+
+#if defined (__ACE_INLINE__)
+#include "Method_Request_Event.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /* TAO_NS_METHOD_REQUEST_EVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.inl
new file mode 100644
index 00000000000..594304747ec
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.inl
@@ -0,0 +1,3 @@
+// $Id$
+
+#include "Method_Request_Event.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index 1ba497e92d5..d876beafbb6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -16,69 +16,78 @@ ACE_RCSID(Notify, TAO_NS_Method_Request_Lookup, "$Id$")
 #include "Admin.h"
 #include "SupplierAdmin.h"
 
-TAO_NS_Method_Request_Lookup::TAO_NS_Method_Request_Lookup (const TAO_NS_Event_var& event, TAO_NS_ProxyConsumer* proxy_consumer, TAO_NS_Consumer_Map* map)
-  : TAO_NS_Method_Request_Event (event), proxy_consumer_ (proxy_consumer), map_ (map),
-    refcountable_guard_ (*proxy_consumer)
+TAO_NS_Method_Request_Lookup::TAO_NS_Method_Request_Lookup (const TAO_NS_Event_var& event, TAO_NS_ProxyConsumer* proxy_consumer)
+  : TAO_NS_Method_Request_Lookup_Base (event, proxy_consumer)
 {
+  this->init (event);
 }
 
 TAO_NS_Method_Request_Lookup::~TAO_NS_Method_Request_Lookup ()
 {
 }
 
-TAO_NS_Method_Request*
-TAO_NS_Method_Request_Lookup::copy (void)
-{
-  /// @@use factory
-  return new TAO_NS_Method_Request_Lookup (this->event_, this->proxy_consumer_, this->map_);
-}
-
 int
 TAO_NS_Method_Request_Lookup::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->proxy_consumer_->has_shutdown ())
-    return 0; // If we were shutdown while waiting in the queue, return with no action.
+  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
 
-  TAO_NS_Admin* parent = this->proxy_consumer_->supplier_admin ();
+/******************************************************************************************************/
 
-  CORBA::Boolean val =  this->proxy_consumer_->check_filters (this->event_,
-                                                              parent->filter_admin (),
-                                                              parent->filter_operator ()
-                                                              ACE_ENV_ARG_PARAMETER);
+TAO_NS_Method_Request_Lookup_No_Copy::TAO_NS_Method_Request_Lookup_No_Copy (const TAO_NS_Event* event, TAO_NS_ProxyConsumer* proxy_consumer)
+  : TAO_NS_Method_Request_Lookup_No_Copy_Base (event, proxy_consumer)
+{
+}
 
-  if (TAO_debug_level > 1)
-    ACE_DEBUG ((LM_DEBUG, "Proxyconsumer %x filter eval result = %d",this->proxy_consumer_ , val));
+TAO_NS_Method_Request_Lookup_No_Copy::~TAO_NS_Method_Request_Lookup_No_Copy ()
+{
+}
 
-  // Filter failed - do nothing.
-  if (val == 0)
-    return 0;
+int
+TAO_NS_Method_Request_Lookup_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
+{
+  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
 
-  TAO_NS_Consumer_Map::ENTRY* entry = map_->find (this->event_->type () ACE_ENV_ARG_PARAMETER);
+TAO_NS_Method_Request*
+TAO_NS_Method_Request_Lookup_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
+{
+  TAO_NS_Method_Request* request;
+
+  TAO_NS_Event* event_copy = this->event_->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  TAO_NS_ProxySupplier_Collection* consumers = 0;
+  TAO_NS_Event_Copy_var event_var (event_copy);
+
+  ACE_NEW_THROW_EX (request,
+                    TAO_NS_Method_Request_Lookup (event_var, this->proxy_consumer_),
+                    CORBA::INTERNAL ());
 
-  if (entry != 0)
-  {
-    consumers = entry->collection ();
+  return request;
+}
 
-    if (consumers != 0)
-      consumers->for_each (this ACE_ENV_ARG_PARAMETER);
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-    this->map_->release (entry);
-  }
+template class TAO_NS_Method_Request_Lookup_T<const TAO_NS_Event_var
+, TAO_NS_ProxyConsumer_Guard
+, const TAO_NS_Event_var&
+, TAO_NS_ProxyConsumer*>;
 
-  // Get the default consumers
-  consumers = map_->broadcast_collection ();
+template class TAO_NS_Method_Request_Lookup_T<const TAO_NS_Event*
+, TAO_NS_ProxyConsumer*
+, const TAO_NS_Event*
+, TAO_NS_ProxyConsumer*>;
 
-  if (consumers != 0)
-    consumers->for_each (this ACE_ENV_ARG_PARAMETER);
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-  return 0;
-}
+#pragma instantiate TAO_NS_Method_Request_Lookup_T<const TAO_NS_Event_var
+, TAO_NS_ProxyConsumer_Guard
+, const TAO_NS_Event_var&
+, TAO_NS_ProxyConsumer*>
 
-void
-TAO_NS_Method_Request_Lookup::work (TAO_NS_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL_NOT_USED)
-{
-  proxy_supplier->push (this->event_);
-}
+#pragma instantiate TAO_NS_Method_Request_Lookup_T<const TAO_NS_Event*
+, TAO_NS_ProxyConsumer*
+, const TAO_NS_Event*
+, TAO_NS_ProxyConsumer*>
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
index 4de8749c7e9..8aa5af10287 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
@@ -21,44 +21,65 @@
 
 #include "orbsvcs/ESF/ESF_Worker.h"
 #include "Method_Request.h"
-#include "ProxySupplier.h"
+#include "ProxyConsumer.h"
 #include "Consumer_Map.h"
+#include "Method_Request_Lookup_T.h"
 
 class TAO_NS_ProxyConsumer;
 
+typedef TAO_NS_Method_Request_Lookup_T<const TAO_NS_Event_var
+                                       , TAO_NS_ProxyConsumer_Guard
+                                       , const TAO_NS_Event_var&
+                                       , TAO_NS_ProxyConsumer*>  TAO_NS_Method_Request_Lookup_Base;
+
 /**
  * @class TAO_NS_Method_Request_Lookup
  *
  * @brief Lookup command object looks up the event type of the given event in the consumer map and send the event to each proxysupplier.
  *
  */
-class TAO_Notify_Export TAO_NS_Method_Request_Lookup : public TAO_NS_Method_Request_Event, public TAO_ESF_Worker<TAO_NS_ProxySupplier>
+class TAO_Notify_Export TAO_NS_Method_Request_Lookup : public TAO_NS_Method_Request_Lookup_Base
+                                                       , public TAO_NS_Method_Request
 {
 public:
   /// Constuctor
-  TAO_NS_Method_Request_Lookup (const TAO_NS_Event_var& event, TAO_NS_ProxyConsumer* proxy_consumer, TAO_NS_Consumer_Map* map);
+  TAO_NS_Method_Request_Lookup (const TAO_NS_Event_var& event, TAO_NS_ProxyConsumer* proxy_consumer);
 
   /// Destructor
   ~TAO_NS_Method_Request_Lookup ();
 
-  /// Create a copy of this object.
-  TAO_NS_Method_Request* copy (void);
-
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+};
+
+/*****************************************************************************************************************************/
 
-  ///= TAO_ESF_Worker method
-  void work (TAO_NS_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
+typedef TAO_NS_Method_Request_Lookup_T<const TAO_NS_Event*
+                                       , TAO_NS_ProxyConsumer*
+                                       , const TAO_NS_Event*
+                                       , TAO_NS_ProxyConsumer*>  TAO_NS_Method_Request_Lookup_No_Copy_Base;
+
+/**
+ * @class TAO_NS_Method_Request_Lookup_No_Copy
+ *
+ * @brief Lookup command object looks up the event type of the given event in the consumer map and send the event to each proxysupplier.
+ *
+ */
+class TAO_Notify_Export TAO_NS_Method_Request_Lookup_No_Copy : public TAO_NS_Method_Request_Lookup_No_Copy_Base
+                                                               , public TAO_NS_Method_Request_No_Copy
+{
+public:
+  /// Constuctor
+  TAO_NS_Method_Request_Lookup_No_Copy (const TAO_NS_Event* event, TAO_NS_ProxyConsumer* proxy_consumer);
 
-private:
-  /// ProxyConsumer supplying event.
-  TAO_NS_ProxyConsumer* proxy_consumer_;
+  /// Destructor
+  ~TAO_NS_Method_Request_Lookup_No_Copy ();
 
-  /// The map of subscriptions.
-  TAO_NS_Consumer_Map* map_;
+  /// Execute the Request
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// Guard to automatically inc/decr ref count on the proxy.
-  TAO_NS_Refcountable_Guard refcountable_guard_;
+  /// Create a copy of this object.
+  virtual TAO_NS_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.cpp
new file mode 100644
index 00000000000..bf9f1220aa9
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.cpp
@@ -0,0 +1,31 @@
+// $Id$
+#ifndef TAO_NS_Method_Request_Lookup_T_CPP
+#define TAO_NS_Method_Request_Lookup_T_CPP
+
+#include "Method_Request_Lookup_T.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "Method_Request_Lookup_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(Notify, TAO_NS_Method_Request_Lookup_T, "$id$")
+
+template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
+TAO_NS_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::TAO_NS_Method_Request_Lookup_T (EVENT_PARAM event, PROXY_PARAM proxy_consumer)
+  :event_ (event), proxy_consumer_ (proxy_consumer)
+{
+}
+
+template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
+TAO_NS_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::~TAO_NS_Method_Request_Lookup_T ()
+{
+}
+
+
+template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM> void
+TAO_NS_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::work (TAO_NS_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL)
+{
+  proxy_supplier->push (this->event_ ACE_ENV_ARG_PARAMETER);
+}
+
+#endif /* TAO_NS_Method_Request_Lookup_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h
new file mode 100644
index 00000000000..607f1d09c0c
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h
@@ -0,0 +1,68 @@
+/* -*- C++ -*- */
+/**
+ *  @file Method_Request_Lookup_T.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_METHOD_REQUEST_LOOKUP_T_H
+#define TAO_NS_METHOD_REQUEST_LOOKUP_T_H
+#include "ace/pre.h"
+
+#include "notify_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "orbsvcs/ESF/ESF_Worker.h"
+#include "ProxySupplier.h"
+
+/**
+ * @class TAO_NS_Method_Request_Lookup_T
+ *
+ * @brief
+ *
+ */
+template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM>
+class TAO_Notify_Export TAO_NS_Method_Request_Lookup_T : public TAO_ESF_Worker<TAO_NS_ProxySupplier>
+{
+public:
+  /// Constuctor
+  TAO_NS_Method_Request_Lookup_T (EVENT_PARAM event, PROXY_PARAM proxy);
+
+  /// Destructor
+  virtual ~TAO_NS_Method_Request_Lookup_T ();
+
+  /// Execute the dispatch operation.
+  int execute_i (ACE_ENV_SINGLE_ARG_DECL);
+
+protected:
+  ///= TAO_ESF_Worker method
+  virtual void work (TAO_NS_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
+
+  /// The Event
+  EVENT event_;
+
+  /// The Proxy
+  PROXY proxy_consumer_;
+};
+
+#if defined (__ACE_INLINE__)
+#include "Method_Request_Lookup_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Method_Request_Lookup_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Method_Request_Lookup_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+#endif /* TAO_NS_METHOD_REQUEST_LOOKUP_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl
new file mode 100644
index 00000000000..1af1a467b7b
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl
@@ -0,0 +1,50 @@
+// $Id$
+
+#include "Event_Manager.h"
+
+template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM> ACE_INLINE int
+TAO_NS_Method_Request_Lookup_T<EVENT, PROXY, EVENT_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+{
+  if (this->proxy_consumer_->has_shutdown ())
+    return 0; // If we were shutdown while waiting in the queue, return with no action.
+
+  TAO_NS_Admin* parent = this->proxy_consumer_->supplier_admin ();
+
+  CORBA::Boolean val =  this->proxy_consumer_->check_filters (this->event_,
+                                                             parent->filter_admin (),
+                                                             parent->filter_operator ()
+                                                             ACE_ENV_ARG_PARAMETER);
+
+  if (TAO_debug_level > 1)
+    ACE_DEBUG ((LM_DEBUG, "Proxyconsumer %x filter eval result = %d",&this->proxy_consumer_ , val));
+
+  // Filter failed - do nothing.
+  if (val == 0)
+    return 0;
+
+  // The map of subscriptions.
+  TAO_NS_Consumer_Map* map = this->proxy_consumer_->event_manager ()->consumer_map ();
+
+  TAO_NS_Consumer_Map::ENTRY* entry = map->find (this->event_->type () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  TAO_NS_ProxySupplier_Collection* consumers = 0;
+
+  if (entry != 0)
+  {
+    consumers = entry->collection ();
+
+    if (consumers != 0)
+      consumers->for_each (this ACE_ENV_ARG_PARAMETER);
+
+    map->release (entry);
+  }
+
+  // Get the default consumers
+  consumers = map->broadcast_collection ();
+
+  if (consumers != 0)
+    consumers->for_each (this ACE_ENV_ARG_PARAMETER);
+
+  return 0;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
index a8d81750d1b..26633a89aff 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
@@ -13,7 +13,7 @@ ACE_RCSID(Notify, TAO_NS_Method_Request_Updates, "$Id$")
 #include "Peer.h"
 
 TAO_NS_Method_Request_Updates::TAO_NS_Method_Request_Updates (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed, TAO_NS_Proxy* proxy)
-  :added_ (added), removed_ (removed), proxy_ (proxy), refcountable_guard_ (*proxy)
+  : TAO_NS_Method_Request_Updates_Base (added, removed, proxy)
 {
 }
 
@@ -21,35 +21,68 @@ TAO_NS_Method_Request_Updates::~TAO_NS_Method_Request_Updates ()
 {
 }
 
+int
+TAO_NS_Method_Request_Updates::execute (ACE_ENV_SINGLE_ARG_DECL)
+{
+  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+/********************************************************************************************************/
+
+TAO_NS_Method_Request_Updates_No_Copy::TAO_NS_Method_Request_Updates_No_Copy (const TAO_NS_EventTypeSeq& added
+                                                                              , const TAO_NS_EventTypeSeq& removed, TAO_NS_Proxy* proxy)
+  : TAO_NS_Method_Request_Updates_No_Copy_Base (added, removed, proxy)
+{
+}
+
+TAO_NS_Method_Request_Updates_No_Copy::~TAO_NS_Method_Request_Updates_No_Copy ()
+{
+}
+
 TAO_NS_Method_Request*
-TAO_NS_Method_Request_Updates::copy (void)
+TAO_NS_Method_Request_Updates_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
-  /// @@use factory
-  return new TAO_NS_Method_Request_Updates (this->added_, this->removed_, this->proxy_);
+  TAO_NS_Method_Request* request;
+
+  ACE_NEW_THROW_EX (request,
+                    TAO_NS_Method_Request_Updates (this->added_, this->removed_, this->proxy_),
+                    CORBA::INTERNAL ());
+
+  return request;
 }
 
 int
-TAO_NS_Method_Request_Updates::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NS_Method_Request_Updates_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->proxy_->has_shutdown ())
-    return 0; // If we were shutdown while waiting in the queue, return with no action.
-
-  ACE_TRY
-    {
-      TAO_NS_Peer* peer = this->proxy_->peer();
-
-      if (peer != 0)
-        {
-          peer->dispatch_updates (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_NS_Method_Request_Updates::execute error sending updates\n ");
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO_NS_Method_Request_Updates_T<const TAO_NS_EventTypeSeq
+, TAO_NS_Proxy_Guard
+, const TAO_NS_EventTypeSeq&
+, TAO_NS_Proxy*
+>;
+
+template class TAO_NS_Method_Request_Updates_T<const TAO_NS_EventTypeSeq&
+, TAO_NS_Proxy*
+, const TAO_NS_EventTypeSeq&
+, TAO_NS_Proxy*
+>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_NS_Method_Request_Updates_T<const TAO_NS_EventTypeSeq
+, TAO_NS_Proxy_Guard
+, const TAO_NS_EventTypeSeq&
+, TAO_NS_Proxy*
+>
+
+#pragma instantiate TAO_NS_Method_Request_Updates_T<const TAO_NS_EventTypeSeq&
+, TAO_NS_Proxy*
+, const TAO_NS_EventTypeSeq&
+, TAO_NS_Proxy*
+>
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
index 282b5df3097..9ff84646784 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
@@ -19,11 +19,16 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "Method_Request_Updates_T.h"
 #include "Method_Request.h"
 #include "EventTypeSeq.h"
-#include "Refcountable.h"
+#include "Proxy.h"
 
-class TAO_NS_Proxy;
+typedef TAO_NS_Method_Request_Updates_T<const TAO_NS_EventTypeSeq
+                                        , TAO_NS_Proxy_Guard
+                                        , const TAO_NS_EventTypeSeq&
+                                        , TAO_NS_Proxy*
+                                        > TAO_NS_Method_Request_Updates_Base;
 
 /**
  * @class TAO_NS_Method_Request_Updates
@@ -31,7 +36,8 @@ class TAO_NS_Proxy;
  * @brief Command Object to send updates to proxys.
  *
  */
-class TAO_Notify_Export TAO_NS_Method_Request_Updates : public TAO_NS_Method_Request
+class TAO_Notify_Export TAO_NS_Method_Request_Updates : public TAO_NS_Method_Request_Updates_Base
+                                                        ,public TAO_NS_Method_Request
 {
 public:
   /// Constuctor
@@ -40,22 +46,39 @@ public:
   /// Destructor
   ~TAO_NS_Method_Request_Updates ();
 
-  /// Create a copy of this object.
-  TAO_NS_Method_Request* copy (void);
-
   /// Execute the Request
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+};
+
+/***********************************************************************************************************************/
+
+typedef TAO_NS_Method_Request_Updates_T<const TAO_NS_EventTypeSeq&
+                                        , TAO_NS_Proxy*
+                                        , const TAO_NS_EventTypeSeq&
+                                        , TAO_NS_Proxy*
+                                        > TAO_NS_Method_Request_Updates_No_Copy_Base;
+
+/**
+ * @class TAO_NS_Method_Request_Updates_No_Copy
+ *
+ * @brief Command Object to send updates to proxys.
+ *
+ */
+class TAO_Notify_Export TAO_NS_Method_Request_Updates_No_Copy : public TAO_NS_Method_Request_Updates_No_Copy_Base
+                                                                ,public TAO_NS_Method_Request_No_Copy
+{
+public:
+  /// Constuctor
+  TAO_NS_Method_Request_Updates_No_Copy (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed, TAO_NS_Proxy* proxy);
 
-private:
-  /// The Updates
-  const TAO_NS_EventTypeSeq added_;
-  const TAO_NS_EventTypeSeq removed_;
+  /// Destructor
+  ~TAO_NS_Method_Request_Updates_No_Copy ();
 
-  /// The proxy that will receive the updates.
-  TAO_NS_Proxy* proxy_;
+  /// Create a copy of this object.
+  virtual TAO_NS_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// Guard to automatically inc/decr ref count on the proxy.
-  TAO_NS_Refcountable_Guard refcountable_guard_;
+  /// Execute the Request
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
new file mode 100644
index 00000000000..e191e7edb85
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
@@ -0,0 +1,25 @@
+// $Id$
+#ifndef TAO_NS_Method_Request_Updates_T_CPP
+#define TAO_NS_Method_Request_Updates_T_CPP
+
+#include "Method_Request_Updates_T.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "Method_Request_Updates_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(Notify, TAO_NS_Method_Request_Updates_T, "$id$")
+
+template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM>
+TAO_NS_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::TAO_NS_Method_Request_Updates_T (SEQ_PARAM added, SEQ_PARAM removed,
+                                                                                                      PROXY_PARAM proxy)
+  : added_ (added), removed_ (removed), proxy_ (proxy)
+{
+}
+
+template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM>
+TAO_NS_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::~TAO_NS_Method_Request_Updates_T ()
+{
+}
+
+#endif /* TAO_NS_Method_Request_Updates_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
new file mode 100644
index 00000000000..ae64d1eb0a4
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
@@ -0,0 +1,67 @@
+/* -*- C++ -*- */
+/**
+ *  @file Method_Request_Updates_T.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_METHOD_REQUEST_UPDATES_T_H
+#define TAO_NS_METHOD_REQUEST_UPDATES_T_H
+#include "ace/pre.h"
+
+#include "notify_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/corba.h"
+
+/**
+ * @class TAO_NS_Method_Request_Updates_T
+ *
+ * @brief
+ *
+ */
+template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM>
+class TAO_Notify_Export TAO_NS_Method_Request_Updates_T
+{
+public:
+  /// Constuctor
+  TAO_NS_Method_Request_Updates_T (SEQ_PARAM added, SEQ_PARAM removed, PROXY_PARAM proxy);
+
+  /// Destructor
+  virtual ~TAO_NS_Method_Request_Updates_T ();
+
+  /// Execute the Request
+  int execute_i (ACE_ENV_SINGLE_ARG_DECL);
+
+protected:
+  /// Update Added
+  SEQ added_;
+
+  /// Update Removed
+  SEQ removed_;
+
+  /// The Proxy that will receive the updates.
+  PROXY proxy_;
+};
+
+#if defined (__ACE_INLINE__)
+#include "Method_Request_Updates_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Method_Request_Updates_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Method_Request_Updates_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+#endif /* TAO_NS_METHOD_REQUEST_UPDATES_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
new file mode 100644
index 00000000000..a78679f4b9a
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
@@ -0,0 +1,29 @@
+// $Id$
+
+#include "Peer.h"
+
+template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM> ACE_INLINE int
+TAO_NS_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+{
+  if (this->proxy_->has_shutdown ())
+    return 0; // If we were shutdown while waiting in the queue, return with no action.
+
+  ACE_TRY
+    {
+      TAO_NS_Peer* peer = this->proxy_->peer();
+
+      if (peer != 0)
+        {
+          peer->dispatch_updates (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      if (TAO_debug_level > 0)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_NS_Method_Request_Updates::execute error sending updates\n ");
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h
index 43c2906996b..7c8dc3bf41f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h
@@ -101,6 +101,9 @@ public:
   /// shutdown. Returns 1 ifif the shutdown was already run once before.
   virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
+  /// Accessor for the Event Manager
+  TAO_NS_Event_Manager* event_manager (void);
+
 protected:
   /// Init this object with data from <rhs>.
   void init (TAO_NS_Object* parent);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
index 251c0655e6d..5cf10b3b1c9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
@@ -35,3 +35,9 @@ TAO_NS_Object::has_shutdown (void)
 {
   return this->shutdown_;
 }
+
+ACE_INLINE TAO_NS_Event_Manager*
+TAO_NS_Object::event_manager (void)
+{
+  return this->event_manager_;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
index d774e71f795..652645184ee 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
@@ -82,7 +82,7 @@ TAO_NS_Peer::dispatch_updates (const TAO_NS_EventTypeSeq & added, const TAO_NS_E
 
       if (cos_added.length () != 0 || cos_removed.length () != 0)
         {
-          TAO_NS_Refcountable_Guard ref_guard(*this->proxy ()); // Protect this object from being destroyed in this scope.
+          TAO_NS_Proxy_Guard proxy_guard(this->proxy ()); // Protect this object from being destroyed in this scope.
 
           this->dispatch_updates_i (cos_added, cos_removed ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
index f8faf3ac96d..4e7bd74b63b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -17,7 +17,7 @@ TAO_NS_Properties::TAO_NS_Properties (void)
 {
   // In case no conf. file is specified, the EC will default to reactive concurrency.
   NotifyExt::ThreadPoolParams tp_params =
-    {0, 0, 0, 0, 0, 0, 0 };
+    {NotifyExt::CLIENT_PROPAGATED,0, 0, 0, 0, 0, 0, 0,0};
 
   this->ec_qos_.length (1);
   this->ec_qos_[0].name = CORBA::string_dup (NotifyExt::ThreadPool);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
index 4371aea34f9..729742add8d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
@@ -42,7 +42,7 @@ public:
   int init (const CosNotification::PropertySeq& prop_seq);
 
   /// Find the <value> for property <name>. Returns 0 on success.
-  int find (const ACE_CString& name, CosNotification::PropertyValue& value) const;
+  int find (const char* name, CosNotification::PropertyValue& value) const;
 
   /// Return -1 on error.
   int populate (CosNotification::PropertySeq_var& prop_seq);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
index 271543a2f82..ade45a1057e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
@@ -1,7 +1,8 @@
 // $Id$
 
 ACE_INLINE int
-TAO_NS_PropertySeq::find (const ACE_CString& name, CosNotification::PropertyValue& value) const
+TAO_NS_PropertySeq::find (const char* name, CosNotification::PropertyValue& value) const
 {
-  return this->property_map_.find (name, value);
+  ACE_CString str_name (name);
+  return this->property_map_.find (str_name, value);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
index 16fb0099b34..5615477c391 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
@@ -10,12 +10,12 @@ ACE_RCSID(Notify, TAO_NS_Property_Boolean, "$Id$")
 
 #include "PropertySeq.h"
 
-TAO_NS_Property_Boolean::TAO_NS_Property_Boolean (const ACE_CString& name)
+TAO_NS_Property_Boolean::TAO_NS_Property_Boolean (const char* name)
   :name_ (name), valid_(0)
 {
 }
 
-TAO_NS_Property_Boolean::TAO_NS_Property_Boolean (const ACE_CString& name, CORBA::Boolean initial)
+TAO_NS_Property_Boolean::TAO_NS_Property_Boolean (const char* name, CORBA::Boolean initial)
   :name_ (name), value_ (initial), valid_ (1)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
index 1ddb447f418..9dc617f2493 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
@@ -35,10 +35,10 @@ class TAO_Notify_Export TAO_NS_Property_Boolean
 {
 public:
   /// Constuctor
-  TAO_NS_Property_Boolean (const ACE_CString& name, CORBA::Boolean initial);
+  TAO_NS_Property_Boolean (const char* name, CORBA::Boolean initial);
 
   /// Constuctor
-  TAO_NS_Property_Boolean (const ACE_CString& name);
+  TAO_NS_Property_Boolean (const char* name);
 
   /// Assignment from TAO_NS_Property_Boolean
   TAO_NS_Property_Boolean& operator= (const TAO_NS_Property_Boolean& rhs);
@@ -64,7 +64,7 @@ public:
 
 protected:
   /// The Property name.
-  ACE_CString name_;
+  const char* name_;
 
   /// The value
   CORBA::Boolean value_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
index 37c2bb0afd3..a124c957046 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
@@ -16,23 +16,24 @@ ACE_RCSID(Notify, TAO_NS_Property_T, "$Id$")
 /*******************************************************************************/
 
 template <class TYPE>
-TAO_NS_PropertyBase_T<TYPE>::TAO_NS_PropertyBase_T (const ACE_CString& name)
+TAO_NS_PropertyBase_T<TYPE>::TAO_NS_PropertyBase_T (const char* name)
   :name_ (name), valid_(0)
 {
 }
 
 template <class TYPE>
-TAO_NS_PropertyBase_T<TYPE>::TAO_NS_PropertyBase_T (const ACE_CString& name, const TYPE& initial)
+TAO_NS_PropertyBase_T<TYPE>::TAO_NS_PropertyBase_T (const char* name, const TYPE& initial)
   :name_ (name), value_ (initial), valid_ (1)
 {
 }
 
 template <class TYPE>
 TAO_NS_PropertyBase_T<TYPE>::TAO_NS_PropertyBase_T (const TAO_NS_PropertyBase_T &rhs)
+:name_ (rhs.name_),
+ value_ (rhs.value_),
+ valid_ (rhs.valid_)
 {
-  this->name_ = rhs.name_;
-  this->value_ = rhs.value_;
-  this->valid_ = rhs.valid_;
+
 }
 
 template <class TYPE>
@@ -52,13 +53,13 @@ TAO_NS_PropertyBase_T<TYPE>::get (CosNotification::PropertySeq& prop_seq)
 /*******************************************************************************/
 
 template <class TYPE>
-TAO_NS_Property_T<TYPE>::TAO_NS_Property_T (const ACE_CString& name)
+TAO_NS_Property_T<TYPE>::TAO_NS_Property_T (const char* name)
   :TAO_NS_PropertyBase_T <TYPE> (name)
 {
 }
 
 template <class TYPE>
-TAO_NS_Property_T<TYPE>::TAO_NS_Property_T (const ACE_CString& name, const TYPE& initial)
+TAO_NS_Property_T<TYPE>::TAO_NS_Property_T (const char* name, const TYPE& initial)
   :TAO_NS_PropertyBase_T <TYPE> (name, initial)
 {
 }
@@ -68,29 +69,38 @@ TAO_NS_Property_T<TYPE>::set (const TAO_NS_PropertySeq& property_seq)
 {
   CosNotification::PropertyValue value;
 
-  if (property_seq.find (this->name_, value) == -1)
+  if (property_seq.find (this->name_, value) == 0 && (value >>= this->value_))
     {
-      this->valid_ = 0;
-      return -1;
+      this->valid_ = 1;
+      return 0;
     }
 
-  value >>= this->value_;
+  this->valid_ = 0;
+  return -1;
+}
 
-  this->valid_ = 1;
+template <class TYPE> int
+TAO_NS_Property_T<TYPE>::set(const CosNotification::PropertyValue &value)
+{
+  if (value >>= this->value_)
+  {
+    this->valid_ = 1;
+    return 0;
+  }
 
-  return 0;
+  return -1;
 }
 
 /*******************************************************************************/
 
 template <class TYPE>
-TAO_NS_StructProperty_T<TYPE>::TAO_NS_StructProperty_T (const ACE_CString& name)
+TAO_NS_StructProperty_T<TYPE>::TAO_NS_StructProperty_T (const char* name)
   :name_ (name), valid_(0)
 {
 }
 
 template <class TYPE>
-TAO_NS_StructProperty_T<TYPE>::TAO_NS_StructProperty_T (const ACE_CString& name, const TYPE& initial)
+TAO_NS_StructProperty_T<TYPE>::TAO_NS_StructProperty_T (const char* name, const TYPE& initial)
   :name_ (name), value_ (initial), valid_ (1)
 {
 }
@@ -103,15 +113,15 @@ TAO_NS_StructProperty_T<TYPE>::set (const TAO_NS_PropertySeq& property_seq)
   if (property_seq.find (this->name_, value) == 0)
     {
       TYPE* extract_type = 0;
-      
+
       if ((value >>= extract_type)  && extract_type != 0) // make sure we get something valid.
-	{
-	  this->value_ = *extract_type; // copy
-	  this->valid_ = 1;
-	  return 0;
-	}
+        {
+          this->value_ = *extract_type; // copy
+          this->valid_ = 1;
+          return 0;
+        }
     }
-  
+
   this->valid_ = 0;
   return -1;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
index 5b05d472b9f..2d35ac4f475 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
@@ -35,10 +35,10 @@ class TAO_NS_PropertyBase_T
 {
 public:
   /// Constuctor
-  TAO_NS_PropertyBase_T (const ACE_CString& name, const TYPE& initial);
+  TAO_NS_PropertyBase_T (const char* name, const TYPE& initial);
 
   /// Constuctor
-  TAO_NS_PropertyBase_T (const ACE_CString& name);
+  TAO_NS_PropertyBase_T (const char* name);
 
   /// Copy Constuctor
   TAO_NS_PropertyBase_T (const TAO_NS_PropertyBase_T &rhs);
@@ -47,7 +47,7 @@ public:
   ~TAO_NS_PropertyBase_T ();
 
   /// Assignment from TAO_NS_PropertyBase_T
-  TAO_NS_PropertyBase_T& operator= (const TAO_NS_PropertyBase_T& rhs);
+  // TAO_NS_PropertyBase_T& operator= (const TAO_NS_PropertyBase_T& rhs);
 
   /// Assignment from TYPE
   TAO_NS_PropertyBase_T& operator= (const TYPE& rhs);
@@ -72,13 +72,16 @@ public:
 
 protected:
   /// The Property name.
-  ACE_CString name_;
+  const char* name_;
 
   /// The value
   TYPE value_;
 
   /// Is the value valid
   CORBA::Boolean valid_;
+
+private:
+  ACE_UNIMPLEMENTED_FUNC (TAO_NS_PropertyBase_T& operator= (const TAO_NS_PropertyBase_T& rhs))
 };
 
 
@@ -94,10 +97,10 @@ class TAO_NS_Property_T : public TAO_NS_PropertyBase_T<TYPE>
 {
 public:
   /// Constuctor
-  TAO_NS_Property_T (const ACE_CString& name, const TYPE& initial);
+  TAO_NS_Property_T (const char* name, const TYPE& initial);
 
   /// Constuctor
-  TAO_NS_Property_T (const ACE_CString& name);
+  TAO_NS_Property_T (const char* name);
 
   /// Assignment from TYPE
   TAO_NS_Property_T& operator= (const TYPE& rhs);
@@ -105,6 +108,10 @@ public:
   /// Init this Property from the sequence.
   /// Returns 0 on success, -1 on error
   int set (const TAO_NS_PropertySeq& property_seq);
+
+  /// Init this Property from the CosNotification::PropertyValue
+  /// Returns 0 on success, -1 on error
+  int set (const CosNotification::PropertyValue &value);
 };
 
 /*******************************************************************************/
@@ -119,10 +126,10 @@ class TAO_NS_StructProperty_T
 {
 public:
   /// Constuctor
-  TAO_NS_StructProperty_T (const ACE_CString& name, const TYPE& initial);
+  TAO_NS_StructProperty_T (const char* name, const TYPE& initial);
 
   /// Constuctor
-  TAO_NS_StructProperty_T (const ACE_CString& name);
+  TAO_NS_StructProperty_T (const char* name);
 
   /// Init this Property from the sequence.
   /// Returns 0 on success, -1 on error
@@ -136,7 +143,7 @@ public:
 
 protected:
   /// The Property name.
-  ACE_CString name_;
+  const char* name_;
 
   /// The value
   TYPE value_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
index 3442b0fe7c4..ab195431b22 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
@@ -25,22 +25,6 @@ TAO_NS_PropertyBase_T<TYPE>::operator!= (const TYPE &rhs) const
 }
 
 template <class TYPE> ACE_INLINE TAO_NS_PropertyBase_T<TYPE>&
-TAO_NS_PropertyBase_T<TYPE>::operator= (const TAO_NS_PropertyBase_T<TYPE>& rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (rhs.is_valid ())
-  {
-    this->name_ = rhs.name_;
-    this->value_ = rhs.value_;
-    this->valid_ = rhs.valid_;
-  }
-
-  return *this;
-}
-
-template <class TYPE> ACE_INLINE TAO_NS_PropertyBase_T<TYPE>&
 TAO_NS_PropertyBase_T<TYPE>::operator=(const TYPE& value)
 {
   this->value_ = value;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
index f8a9d298565..5e29ea6fdc6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
@@ -51,46 +51,18 @@ TAO_NS_Proxy::subscribed_types (TAO_NS_EventTypeSeq& subscribed_types ACE_ENV_AR
 }
 
 void
-TAO_NS_Proxy::types_changed (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed ACE_ENV_ARG_DECL_NOT_USED)
+TAO_NS_Proxy::types_changed (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Method_Request_Updates request (added, removed, this);
+  TAO_NS_Method_Request_Updates_No_Copy request (added, removed, this);
 
   if (TAO_NS_PROPERTIES::instance()->asynch_updates () == 1) // if we should send the updates synchronously.
     {
-      this->worker_task ()->exec (request);
+      this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
     }
   else // execute in the current thread context.
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
       request.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-      }
-}
-
-CORBA::Boolean
-TAO_NS_Proxy::check_filters (const TAO_NS_Event_var &event
-                             , TAO_NS_FilterAdmin& parent_filter_admin
-                             , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
-                             ACE_ENV_ARG_DECL)
-{
-  // check if it passes the parent filter.
-  CORBA::Boolean parent_val =
-    parent_filter_admin.match (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean val = 0;
-
-  if (filter_operator == CosNotifyChannelAdmin::AND_OP)
-    {
-      val = parent_val && this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
     }
-  else
-    {
-      val = parent_val || this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  return val;
 }
 
 CosNotification::EventTypeSeq*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
index 454235ab477..9e767d25f4f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
@@ -23,6 +23,7 @@
 #include "EventTypeSeq.h"
 #include "FilterAdmin.h"
 #include "Admin.h"
+#include "Refcountable_Guard_T.h"
 
 class TAO_NS_Admin;
 class TAO_NS_Peer;
@@ -57,6 +58,12 @@ public:
   void subscribed_types (TAO_NS_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL);
 
   /// Check if this event passes the admin and proxy filters.
+  CORBA::Boolean check_filters (const TAO_NS_Event* event
+                                , TAO_NS_FilterAdmin& parent_filter_admin
+                                , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
+                                ACE_ENV_ARG_DECL);
+
+  /// Check if this event passes the admin and proxy filters.
   CORBA::Boolean check_filters (const TAO_NS_Event_var &event
                                 , TAO_NS_FilterAdmin& parent_filter_admin
                                 , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
@@ -101,6 +108,8 @@ protected:
   CORBA::Boolean updates_off_;
 };
 
+typedef TAO_NS_Refcountable_Guard_T<TAO_NS_Proxy> TAO_NS_Proxy_Guard;
+
 #if defined (__ACE_INLINE__)
 #include "Proxy.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
index 3610f2b3167..1d74171a622 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
@@ -5,3 +5,39 @@ TAO_NS_Proxy::updates_off (void)
 {
   return this->updates_off_;
 }
+
+ACE_INLINE CORBA::Boolean
+TAO_NS_Proxy::check_filters (const TAO_NS_Event_var &event
+                             , TAO_NS_FilterAdmin& parent_filter_admin
+                             , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
+                             ACE_ENV_ARG_DECL)
+{
+  return this->check_filters (event.get (), parent_filter_admin, filter_operator ACE_ENV_ARG_PARAMETER);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_NS_Proxy::check_filters (const TAO_NS_Event* event
+                             , TAO_NS_FilterAdmin& parent_filter_admin
+                             , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
+                             ACE_ENV_ARG_DECL)
+{
+  // check if it passes the parent filter.
+  CORBA::Boolean parent_val =
+    parent_filter_admin.match (event ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  CORBA::Boolean val = 0;
+
+  if (filter_operator == CosNotifyChannelAdmin::AND_OP)
+    {
+      val = parent_val && this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+    }
+  else
+    {
+      val = parent_val || this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+    }
+
+  return val;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index 86bba03d3d1..445c47ff2b7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -142,10 +142,12 @@ TAO_NS_ProxyConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 }
 
-void
-TAO_NS_ProxyConsumer::push (TAO_NS_Event_var &event)
-{
-  TAO_NS_Method_Request_Lookup request (event, this, this->event_manager_->consumer_map ());
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-  this->worker_task ()->exec (request);
-}
+template class TAO_NS_Refcountable_Guard_T<TAO_NS_ProxyConsumer>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_NS_Refcountable_Guard_T<TAO_NS_ProxyConsumer>
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index 807bcf152f3..90b556fd55c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -20,9 +20,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "orbsvcs/CosEventChannelAdminC.h"
+#include "Refcountable_Guard_T.h"
 #include "Event.h"
 #include "Proxy.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+
 
 class TAO_NS_SupplierAdmin;
 class TAO_NS_Supplier;
@@ -61,9 +63,6 @@ public:
   /// Destroy this object.
   virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// Start event propagation.
-  virtual void push (TAO_NS_Event_var &event);
-
   /// Access our Peer.
   virtual TAO_NS_Peer* peer (void);
 
@@ -85,6 +84,8 @@ protected:
   TAO_NS_Supplier* supplier_;
 };
 
+typedef TAO_NS_Refcountable_Guard_T<TAO_NS_ProxyConsumer> TAO_NS_ProxyConsumer_Guard;
+
 #if defined (__ACE_INLINE__)
 #include "ProxyConsumer.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index 1937f983ed6..c8d169267cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -8,7 +8,6 @@
 
 ACE_RCSID(RT_Notify, TAO_NS_ProxySupplier, "$Id$")
 
-#include "Method_Request_Dispatch_No_Filtering.h"
 #include "Event_Manager.h"
 #include "AdminProperties.h"
 #include "Consumer.h"
@@ -140,19 +139,35 @@ TAO_NS_ProxySupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_ProxySupplier::push (const TAO_NS_Event_var &event)
+TAO_NS_ProxySupplier::push (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Method_Request_Dispatch request (event, this);
+  TAO_NS_Method_Request_Dispatch_No_Copy request (event, this, 1);
 
-  this->worker_task ()->exec (request);
+  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_ProxySupplier::push_no_filtering (const TAO_NS_Event_var &event)
+TAO_NS_ProxySupplier::push (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Method_Request_Dispatch_No_Filtering request (event, this);
+  TAO_NS_Method_Request_Dispatch_No_Copy_Ex request (event, this, 1);
 
-  this->worker_task ()->exec (request);
+  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_NS_ProxySupplier::push_no_filtering (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+{
+  TAO_NS_Method_Request_Dispatch_No_Copy request (event, this, 0); // No filtering.
+
+  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_NS_ProxySupplier::push_no_filtering (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
+{
+  TAO_NS_Method_Request_Dispatch_No_Copy_Ex request (event, this, 0); // No filtering.
+
+  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -177,3 +192,14 @@ TAO_NS_ProxySupplier::qos_changed (const TAO_NS_QoSProperties& qos_properties)
 
   TAO_NS_Proxy::qos_changed (qos_properties);
 }
+
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO_NS_Refcountable_Guard_T<TAO_NS_ProxySupplier>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_NS_Refcountable_Guard_T<TAO_NS_ProxySupplier>
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
index dfb5bb590b9..1e8ee3c7bed 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -21,6 +21,7 @@
 
 #include "Event.h"
 #include "Proxy.h"
+#include "Refcountable_Guard_T.h"
 #include "orbsvcs/CosEventChannelAdminC.h"
 
 class TAO_NS_Consumer;
@@ -56,10 +57,16 @@ public:
   void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Dispatch Event to consumer
-  virtual void push (const TAO_NS_Event_var &event);
+  virtual void push (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+
+  /// Dispatch Event to consumer
+  virtual void push (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer, no filtering
-  virtual void push_no_filtering (const TAO_NS_Event_var &event);
+  virtual void push_no_filtering (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+
+  /// Dispatch Event to consumer, no filtering
+  virtual void push_no_filtering (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Override TAO_NS_Container_T::shutdown  method
   virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
@@ -92,6 +99,8 @@ protected:
   TAO_NS_Consumer* consumer_;
 };
 
+typedef TAO_NS_Refcountable_Guard_T<TAO_NS_ProxySupplier> TAO_NS_ProxySupplier_Guard;
+
 #if defined (__ACE_INLINE__)
 #include "ProxySupplier.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
index b4319499c26..895d44fdb6c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
@@ -16,7 +16,6 @@ ACE_RCSID(Notify, TAO_NS_ProxySupplier_T, "$Id$")
 #include "Any/AnyEvent.h"
 
 #include "Method_Request_Dispatch.h"
-#include "Method_Request_Dispatch_No_Filtering.h"
 #include "Worker_Task.h"
 #include "Event_Manager.h"
 #include "ConsumerAdmin.h"
@@ -41,55 +40,55 @@ TAO_NS_ProxySupplier_T<SERVANT_TYPE>::admin_types_changed (const CosNotification
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::forward_structured (const CosNotification::StructuredEvent& notification ACE_ENV_ARG_DECL_NOT_USED)
+TAO_NS_ProxySupplier_T<SERVANT_TYPE>::forward_structured (const CosNotification::StructuredEvent& notification ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  TAO_NS_Event_var event (new TAO_NS_StructuredEvent (notification));
+  TAO_NS_StructuredEvent_No_Copy event (notification);
 
-  TAO_NS_Method_Request_Dispatch request (event, this);
+  TAO_NS_Method_Request_Dispatch_No_Copy request (&event, this, 1);
 
-  this->worker_task ()->exec (request);
+  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::forward_structured_no_filtering (const CosNotification::StructuredEvent& notification ACE_ENV_ARG_DECL_NOT_USED)
+TAO_NS_ProxySupplier_T<SERVANT_TYPE>::forward_structured_no_filtering (const CosNotification::StructuredEvent& notification ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  TAO_NS_Event_var event (new TAO_NS_StructuredEvent (notification));
+  TAO_NS_StructuredEvent_No_Copy event(notification);
 
-  TAO_NS_Method_Request_Dispatch_No_Filtering request (event, this);
+  TAO_NS_Method_Request_Dispatch_No_Copy request (&event, this, 0);
 
-  this->worker_task ()->exec (request);
+  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::forward_any (const CORBA::Any & data ACE_ENV_ARG_DECL_NOT_USED)
+TAO_NS_ProxySupplier_T<SERVANT_TYPE>::forward_any (const CORBA::Any & any ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  TAO_NS_Event_var event (new TAO_NS_AnyEvent (data));
+  TAO_NS_AnyEvent_No_Copy event (any);
 
-  TAO_NS_Method_Request_Dispatch request (event, this);
+  TAO_NS_Method_Request_Dispatch_No_Copy request (&event, this, 1);
 
-  this->worker_task ()->exec (request);
+  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
-TAO_NS_ProxySupplier_T<SERVANT_TYPE>::forward_any_no_filtering (const CORBA::Any& data ACE_ENV_ARG_DECL_NOT_USED)
+TAO_NS_ProxySupplier_T<SERVANT_TYPE>::forward_any_no_filtering (const CORBA::Any& any ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ))
 {
-  TAO_NS_Event_var event (new TAO_NS_AnyEvent (data));
+  TAO_NS_AnyEvent_No_Copy event(any);
 
-  TAO_NS_Method_Request_Dispatch_No_Filtering request (event, this);
+  TAO_NS_Method_Request_Dispatch_No_Copy request (&event, this, 0);
 
-  this->worker_task ()->exec (request);
+  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
index 475c349150a..60c229669dd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
@@ -11,13 +11,13 @@ ACE_RCSID(Notify, TAO_NS_QoSProperties, "$Id$")
 #include "Property.h"
 
 TAO_NS_QoSProperties::TAO_NS_QoSProperties (void)
-  :priority_ (CosNotification::Priority),
-   timeout_ (CosNotification::Timeout),
-   stop_time_supported_ (CosNotification::StopTimeSupported),
-   maximum_batch_size_ (CosNotification::MaximumBatchSize),
-   pacing_interval_ (CosNotification::PacingInterval),
-   thread_pool_ (NotifyExt::ThreadPool),
-   thread_pool_lane_ (NotifyExt::ThreadPoolLanes)
+  : priority_ (CosNotification::Priority)
+    , timeout_ (CosNotification::Timeout)
+    , stop_time_supported_ (CosNotification::StopTimeSupported)
+    , maximum_batch_size_ (CosNotification::MaximumBatchSize)
+    , pacing_interval_ (CosNotification::PacingInterval)
+    , thread_pool_ (NotifyExt::ThreadPool)
+    , thread_pool_lane_ (NotifyExt::ThreadPoolLanes)
 {
   unsupported_[0] = CosNotification::EventReliability;
   unsupported_[1] = CosNotification::ConnectionReliability;
@@ -65,14 +65,14 @@ TAO_NS_QoSProperties::init (const CosNotification::PropertySeq& prop_seq, CosNot
 
   if (prop_seq.length () > 0)
   {
-	// Now, init the supported properties
-	this->priority_.set (*this);
-	this->timeout_.set (*this);
-	this->stop_time_supported_.set (*this);
-	this->maximum_batch_size_.set (*this);
-	this->pacing_interval_.set (*this);
-	this->thread_pool_.set (*this);
-	this->thread_pool_lane_.set (*this);
+        // Now, init the supported properties
+        this->priority_.set (*this);
+        this->timeout_.set (*this);
+        this->stop_time_supported_.set (*this);
+        this->maximum_batch_size_.set (*this);
+        this->pacing_interval_.set (*this);
+        this->thread_pool_.set (*this);
+        this->thread_pool_lane_.set (*this);
   }
 
   return err_index == -1 ? 0 : 1;
@@ -81,11 +81,11 @@ TAO_NS_QoSProperties::init (const CosNotification::PropertySeq& prop_seq, CosNot
 int
 TAO_NS_QoSProperties::copy (TAO_NS_QoSProperties& qos_properties)
 {
-  qos_properties.priority_ = this->priority_;
-  qos_properties.timeout_ = this->timeout_;
-  qos_properties.stop_time_supported_ = this->stop_time_supported_;
-  qos_properties.maximum_batch_size_ = this->maximum_batch_size_;
-  qos_properties.pacing_interval_ = this->pacing_interval_;
+  qos_properties.priority_ = this->priority_.value ();
+  qos_properties.timeout_ = this->timeout_.value ();
+  qos_properties.stop_time_supported_ = this->stop_time_supported_.value ();
+  qos_properties.maximum_batch_size_ = this->maximum_batch_size_.value ();
+  qos_properties.pacing_interval_ = this->pacing_interval_.value ();
 
   PROPERTY_MAP::ITERATOR iter (this->property_map_);
   PROPERTY_MAP::ENTRY *entry;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
index 16e29c5d437..fb3803286e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -36,10 +36,18 @@ TAO_NS_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_
 
   RTCORBA::RTORB_var rt_orb = TAO_NS_RT_PROPERTIES::instance ()->rt_orb ();
 
+  RTCORBA::PriorityModel priority_model =
+    tp_params.priority_model == NotifyExt::CLIENT_PROPAGATED ?
+    RTCORBA::CLIENT_PROPAGATED : RTCORBA::SERVER_DECLARED;
+
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG, "Priority Model = %d, Server prio = %d\n"
+                , tp_params.priority_model, tp_params.server_priority));
+
   policy_list.length (3);
   policy_list[2] =
-    rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                          0
+    rt_orb->create_priority_model_policy (priority_model,
+                                          tp_params.server_priority
                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -88,10 +96,14 @@ TAO_NS_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_
 
   RTCORBA::RTORB_var rt_orb = TAO_NS_RT_PROPERTIES::instance ()->rt_orb ();
 
+  RTCORBA::PriorityModel priority_model =
+    tpl_params.priority_model == NotifyExt::CLIENT_PROPAGATED ?
+    RTCORBA::CLIENT_PROPAGATED : RTCORBA::SERVER_DECLARED;
+
   policy_list.length (3);
   policy_list[2] =
-    rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                          0
+    rt_orb->create_priority_model_policy (priority_model,
+                                          tpl_params.server_priority
                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
index 3c78641fd7a..a655b8745da 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
@@ -40,9 +40,8 @@ TAO_NS_Reactive_Task::shutdown (void)
 }
 
 void
-TAO_NS_Reactive_Task::exec (TAO_NS_Method_Request& method_request)
+TAO_NS_Reactive_Task::execute (TAO_NS_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   method_request.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
index 98d77a6c39c..adb64d1f78a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
@@ -49,7 +49,7 @@ public:
   virtual void shutdown (void);
 
   /// Exec the request.
-  virtual void exec (TAO_NS_Method_Request& method_request);
+  virtual void execute (TAO_NS_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL);
 
   /// The object used by clients to register timers. This method returns a Reactor based Timer.
   virtual TAO_NS_Timer* timer (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
index 77a45cd16fa..d01a49b347f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
@@ -53,26 +53,6 @@ protected:
   TAO_SYNCH_MUTEX lock_;
 };
 
-/***********************************************************************/
-
-/**
- * @class TAO_NS_Refcountable_Guard
- *
- * @brief Ref. Count Guard
- *        Increments the reference count in the constructor, the count is decremented when the guard's is destructor.
- *
- */
-class TAO_Notify_Export TAO_NS_Refcountable_Guard
-{
-public:
-  TAO_NS_Refcountable_Guard (TAO_NS_Refcountable& refcountable);
-
-  ~TAO_NS_Refcountable_Guard ();
-
-protected:
-  TAO_NS_Refcountable& refcountable_;
-};
-
 #if defined (__ACE_INLINE__)
 #include "Refcountable.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.inl b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.inl
index be75f075cd8..74e88caa0c5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.inl
@@ -1,14 +1,2 @@
 // $Id$
 
-ACE_INLINE
-TAO_NS_Refcountable_Guard::TAO_NS_Refcountable_Guard (TAO_NS_Refcountable& refcountable)
-  :refcountable_ (refcountable)
-{
-  this->refcountable_._incr_refcnt ();
-}
-
-ACE_INLINE
-TAO_NS_Refcountable_Guard::~TAO_NS_Refcountable_Guard ()
-{
-  this->refcountable_._decr_refcnt ();
-}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
new file mode 100644
index 00000000000..9af293e7bfa
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
@@ -0,0 +1,14 @@
+// $Id$
+
+#ifndef TAO_NS_REFCOUNTABLE_GUARD_T_CPP
+#define TAO_NS_REFCOUNTABLE_GUARD_T_CPP
+
+#include "Refcountable_Guard_T.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "Refcountable_Guard_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(Notify, TAO_NS_Refcountable_Guard_T, "$id$")
+
+#endif /* TAO_NS_REFCOUNTABLE_GUARD_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
new file mode 100644
index 00000000000..22af0962291
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
@@ -0,0 +1,60 @@
+/* -*- C++ -*- */
+/**
+ *  @file Refcountable_Guard_T.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_REFCOUNTABLE_GUARD_T_H
+#define TAO_NS_REFCOUNTABLE_GUARD_T_H
+#include "ace/pre.h"
+
+#include "notify_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class TAO_NS_Refcountable_Guard_T
+ *
+ * @brief Increments the reference count in the constructor, the count is decremented in the destructor.
+ *
+ */
+template <class T>
+class TAO_NS_Refcountable_Guard_T
+{
+public:
+  /// Constuctor
+  TAO_NS_Refcountable_Guard_T (T* t);
+
+  /// Destructor
+  ~TAO_NS_Refcountable_Guard_T ();
+
+  /// Redirection operator
+  T *operator-> (void) const;
+
+  T &operator *() const;
+
+private:
+  T* t_;
+};
+
+#if defined (__ACE_INLINE__)
+#include "Refcountable_Guard_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Refcountable_Guard_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Refcountable_Guard_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+#endif /* TAO_NS_REFCOUNTABLE_GUARD_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
new file mode 100644
index 00000000000..2e11b1ff701
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
@@ -0,0 +1,26 @@
+// $Id$
+
+template <class T> ACE_INLINE
+TAO_NS_Refcountable_Guard_T<T>::TAO_NS_Refcountable_Guard_T (T *t)
+  : t_ (t)
+{
+  this->t_->_incr_refcnt ();
+}
+
+template <class T> ACE_INLINE
+TAO_NS_Refcountable_Guard_T<T>::~TAO_NS_Refcountable_Guard_T ()
+{
+  this->t_->_decr_refcnt ();
+}
+
+template <class T> ACE_INLINE T*
+TAO_NS_Refcountable_Guard_T<T>::operator-> (void) const
+{
+  return this->t_;
+}
+
+template <class T> ACE_INLINE T&
+TAO_NS_Refcountable_Guard_T<T>::operator *(void) const
+{
+  return *this->t_;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
index 1c819aa54ba..fd9aef09f34 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "Batch_Buffering_Strategy.h"
+#include "../Method_Request_Event.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "Batch_Buffering_Strategy.inl"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
index c1b7ea4bdfa..4b95bd7ee25 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
@@ -11,6 +11,8 @@ ACE_RCSID(Notify, TAO_NS_SequenceProxyPushConsumer, "$id$")
 #include "tao/debug.h"
 #include "SequencePushSupplier.h"
 #include "../AdminProperties.h"
+#include "../Method_Request_Lookup.h"
+#include "../Worker_Task.h"
 #include "../Structured/StructuredEvent.h"
 
 TAO_NS_SequenceProxyPushConsumer::TAO_NS_SequenceProxyPushConsumer (void)
@@ -92,9 +94,11 @@ TAO_NS_SequenceProxyPushConsumer::push_structured_events (const CosNotification:
     {
       const CosNotification::StructuredEvent& notification = event_batch[i];
 
-      TAO_NS_Event_var event (new TAO_NS_StructuredEvent (notification));
+      TAO_NS_StructuredEvent_No_Copy event (notification);
 
-      this->push (event);
+      TAO_NS_Method_Request_Lookup_No_Copy request (&event, this);
+
+      this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
index 36abbc2ba37..73249688e24 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -14,8 +14,9 @@ ACE_RCSID(Notify, TAO_NS_SequencePushConsumer, "$id$")
 #include "../ProxySupplier.h"
 #include "../Worker_Task.h"
 #include "../Consumer.h"
-#include "../Method_Request.h"
+#include "../Method_Request_Event.h"
 #include "../Timer.h"
+#include "../Proxy.h"
 
 TAO_NS_SequencePushConsumer::TAO_NS_SequencePushConsumer (TAO_NS_ProxySupplier* proxy)
   : TAO_NS_Consumer (proxy), pacing_interval_ (ACE_Time_Value::zero), timer_id_ (-1), buffering_strategy_ (0),
@@ -60,7 +61,7 @@ TAO_NS_SequencePushConsumer::release (void)
 void
 TAO_NS_SequencePushConsumer::qos_changed (const TAO_NS_QoSProperties& qos_properties)
 {
-  this->max_batch_size_ = qos_properties.maximum_batch_size ();
+  this->max_batch_size_ = qos_properties.maximum_batch_size ().value ();
 
   if (this->max_batch_size_.is_valid ())
     {// set the max batch size.
@@ -103,9 +104,24 @@ TAO_NS_SequencePushConsumer::cancel_timer (void)
 }
 
 void
-TAO_NS_SequencePushConsumer::push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL_NOT_USED)
+TAO_NS_SequencePushConsumer::push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Method_Request_Event* method_request = new TAO_NS_Method_Request_Event (event);
+  TAO_NS_Event* copy = event->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  TAO_NS_Event_Copy_var copy_var (copy);
+
+  this->push_i (copy_var ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_NS_SequencePushConsumer::push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL)
+{
+  TAO_NS_Method_Request_Event* method_request;
+
+  ACE_NEW_THROW_EX (method_request,
+                    TAO_NS_Method_Request_Event (event),
+                    CORBA::NO_MEMORY ());
 
   int msg_count = this->buffering_strategy_->enqueue (*method_request);
 
@@ -150,7 +166,7 @@ TAO_NS_SequencePushConsumer::handle_timeout (const ACE_Time_Value& /*current_tim
 
   if (deq_count > 0)
     {
-      TAO_NS_Refcountable_Guard ref_guard(*this->proxy ()); // Protect this object from being destroyed in this scope.
+      TAO_NS_Proxy_Guard ref_guard(this->proxy ()); // Protect this object from being destroyed in this scope.
 
       this->push (event_batch);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
index cc7f689b6ac..3a825d974a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
@@ -56,7 +56,9 @@ public:
   virtual void release (void);
 
   /// Push <event> to this consumer.
-  void push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  virtual void push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+
+  virtual void push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
   virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index 65fcee019a1..991d872ed41 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -32,9 +32,9 @@ TAO_NS_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant
 }
 
 void
-TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event_var &event)
+TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
 {
-  ACE_TRY_NEW_ENV
+  ACE_TRY
     {
       event->push (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -51,9 +51,9 @@ TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event_var &event)
 }
 
 void
-TAO_NS_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_NS_Event_var &event)
+TAO_NS_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
 {
-  ACE_TRY_NEW_ENV
+  ACE_TRY
     {
       event->push_no_filtering (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -68,3 +68,15 @@ TAO_NS_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_NS_Event_var
     }
   ACE_ENDTRY;
 }
+
+void
+TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
+{
+  this->push (event.get () ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_NS_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
+{
+  this->push_no_filtering (event.get () ACE_ENV_ARG_PARAMETER);
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
index a183a8193c7..b3516b05ce3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
@@ -39,11 +39,17 @@ public:
   /// Activate this object and obtain the Event_Forwarder interface.
   virtual CORBA::Object_ptr activate (PortableServer::Servant servant ACE_ENV_ARG_DECL);
 
-  /// Override TAO_NS_ProxySupplier::push
-  virtual void push (const TAO_NS_Event_var &event);
+  /// Dispatch Event to consumer
+  virtual void push (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+
+  /// Dispatch Event to consumer
+  virtual void push (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+
+  /// Dispatch Event to consumer, no filtering
+  virtual void push_no_filtering (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer, no filtering
-  virtual void push_no_filtering (const TAO_NS_Event_var &event);
+  virtual void push_no_filtering (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
 
 private:
   /// Our ref.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
index f971a8eb1d9..b12fc8978e2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -12,82 +12,110 @@ ACE_RCSID(RT_Notify, TAO_NS_StructuredEvent, "$Id$")
 #include "../Consumer.h"
 #include "tao/debug.h"
 
-TAO_NS_StructuredEvent::TAO_NS_StructuredEvent (const CosNotification::StructuredEvent &notification)
-  : notification_ (notification), type_ (notification.header.fixed_header.event_type)
+TAO_NS_StructuredEvent_No_Copy::TAO_NS_StructuredEvent_No_Copy (const CosNotification::StructuredEvent &notification)
+  : notification_ (&notification), type_ (notification.header.fixed_header.event_type)
 {
-  TAO_NS_PropertySeq qos;
-
-  if (qos.init (this->notification_.header.variable_header) != -1)
-  {
-    this->priority_.set (qos);
-    this->timeout_.set (qos);
-  }
+  const CosNotification::PropertySeq& prop_seq = notification.header.variable_header;
+
+  for (CORBA::ULong i = 0; i < prop_seq.length (); ++i)
+    {
+      if (ACE_OS::strcmp (prop_seq[i].name.in (), CosNotification::Priority) == 0)
+        this->priority_.set (prop_seq[i].value);
+      else if (ACE_OS::strcmp (prop_seq[i].name.in (), CosNotification::Timeout) == 0)
+        this->timeout_.set (prop_seq[i].value);
+    }
 }
 
 const TAO_NS_EventType&
-TAO_NS_StructuredEvent::type (void) const
+TAO_NS_StructuredEvent_No_Copy::type (void) const
 {
   return this->type_;
 }
 
-TAO_NS_StructuredEvent::~TAO_NS_StructuredEvent ()
+TAO_NS_StructuredEvent_No_Copy::~TAO_NS_StructuredEvent_No_Copy ()
+{
+}
+
+TAO_NS_Event*
+TAO_NS_StructuredEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
 {
+  TAO_NS_Event* copy;
+
+  ACE_NEW_THROW_EX (copy,
+                    TAO_NS_StructuredEvent (*this->notification_),
+                    CORBA::NO_MEMORY ());
+
+  return copy;
 }
 
 CORBA::Boolean
-TAO_NS_StructuredEvent::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL)
+TAO_NS_StructuredEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                 "TAO_Notify_StructuredEvent::do_match ()\n"));
 
-  return filter->match_structured (this->notification_ ACE_ENV_ARG_PARAMETER);
+  return filter->match_structured (*this->notification_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredEvent::convert (CosNotification::StructuredEvent& notification)
+TAO_NS_StructuredEvent_No_Copy::convert (CosNotification::StructuredEvent& notification) const
 {
-  notification = this->notification_;
+  notification = *this->notification_;
 }
 
 void
-TAO_NS_StructuredEvent::push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const
+TAO_NS_StructuredEvent_No_Copy::push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                           "TAO_Notify_StructuredEvent::do_push ("
                           "CosNotifyComm::StructuredPushConsumer_ptr)\n"));
 
-  consumer->push (notification_ ACE_ENV_ARG_PARAMETER);
+  consumer->push (*this->notification_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredEvent::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL)
+TAO_NS_StructuredEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
-  forwarder->forward_structured (notification_ ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_structured (*this->notification_ ACE_ENV_ARG_PARAMETER);
 }
+
 void
-TAO_NS_StructuredEvent::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL)
+TAO_NS_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
-  forwarder->forward_structured_no_filtering (notification_ ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_structured_no_filtering (*this->notification_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredEvent::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL)
+TAO_NS_StructuredEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   CORBA::Any any;
 
-  TAO_NS_Event::translate (this->notification_, any);
+  TAO_NS_Event::translate (*this->notification_, any);
 
   forwarder->forward_any (any ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredEvent::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL)
+TAO_NS_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   CORBA::Any any;
 
-  TAO_NS_Event::translate (this->notification_, any);
+  TAO_NS_Event::translate (*this->notification_, any);
 
   forwarder->forward_any_no_filtering (any ACE_ENV_ARG_PARAMETER);
 }
+
+/*****************************************************************************************************/
+
+TAO_NS_StructuredEvent::TAO_NS_StructuredEvent (const CosNotification::StructuredEvent& notification)
+  : TAO_NS_StructuredEvent_No_Copy (notification)
+    , notification_copy (notification)
+{
+  this->notification_ = &notification_copy;
+}
+
+TAO_NS_StructuredEvent::~TAO_NS_StructuredEvent ()
+{
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
index 5cf88887188..175913c898c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
@@ -23,25 +23,28 @@
 #include "orbsvcs/CosNotificationC.h"
 
 /**
- * @class TAO_NS_StructuredEvent
+ * @class TAO_NS_StructuredEvent_No_Copy
  *
  * @brief StructuredEvent implementation.
  *
  */
 
-class TAO_Notify_Export TAO_NS_StructuredEvent : public TAO_NS_Event
+class TAO_Notify_Export TAO_NS_StructuredEvent_No_Copy : public TAO_NS_Event
 {
 public:
   /// Constuctor
-  TAO_NS_StructuredEvent (const CosNotification::StructuredEvent& notification);
+  TAO_NS_StructuredEvent_No_Copy (const CosNotification::StructuredEvent& notification);
 
   /// Destructor
-  ~TAO_NS_StructuredEvent ();
+  ~TAO_NS_StructuredEvent_No_Copy ();
 
-  CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL);
+  /// Copy the event.
+  virtual TAO_NS_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const;
+
+  CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const;
 
   /// Convert to CosNotification::Structured type
-  virtual void convert (CosNotification::StructuredEvent& notification);
+  virtual void convert (CosNotification::StructuredEvent& notification) const;
 
   /// Get the event type.
   virtual const TAO_NS_EventType& type (void) const;
@@ -50,25 +53,47 @@ public:
   virtual void push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL);
+  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL);
+  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL);
+  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL);
+  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
 
 protected:
   /// Structured Event
-  CosNotification::StructuredEvent notification_;
+  const CosNotification::StructuredEvent* notification_;
 
   /// Our type.
   const TAO_NS_EventType type_;
 };
 
+/*****************************************************************************************************/
+
+/**
+ * @class TAO_NS_StructuredEvent
+ *
+ * @brief StructuredEvent implementation.
+ *
+ */
+class TAO_Notify_Export TAO_NS_StructuredEvent : public TAO_NS_StructuredEvent_No_Copy
+{
+public:
+  /// Constuctor
+  TAO_NS_StructuredEvent (const CosNotification::StructuredEvent& notification);
+
+  /// Destructor
+  ~TAO_NS_StructuredEvent ();
+
+protected:
+  /// Copy of the Event.
+  CosNotification::StructuredEvent notification_copy;
+};
+
 #if defined (__ACE_INLINE__)
 #include "StructuredEvent.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index 858f2f518ef..2d80fd27dae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -14,6 +14,8 @@ ACE_RCSID(RT_Notify, TAO_NS_StructuredProxyPushConsumer, "$Id$")
 #include "StructuredPushSupplier.h"
 #include "StructuredEvent.h"
 #include "../AdminProperties.h"
+#include "../Method_Request_Lookup.h"
+#include "../Worker_Task.h"
 
 TAO_NS_StructuredProxyPushConsumer::TAO_NS_StructuredProxyPushConsumer (void)
 {
@@ -90,11 +92,11 @@ TAO_NS_StructuredProxyPushConsumer::push_structured_event (const CosNotification
       ACE_THROW (CosEventComm::Disconnected ());
     }
 
-  // Convert
-  TAO_NS_Event_var event (new TAO_NS_StructuredEvent (notification));
+  TAO_NS_StructuredEvent_No_Copy event (notification);
 
-  // Continue processing.
-  this->push (event);
+  TAO_NS_Method_Request_Lookup_No_Copy request (&event, this);
+
+  this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
index e868de67b00..7a9aff05883 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -35,6 +35,12 @@ TAO_NS_StructuredPushConsumer::release (void)
 }
 
 void
+TAO_NS_StructuredPushConsumer::push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+{
+  event->push (this ACE_ENV_ARG_PARAMETER);
+}
+
+void
 TAO_NS_StructuredPushConsumer::push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL)
 {
   event->push (this ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
index 28fb81439da..d0e950a34c5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
@@ -46,7 +46,10 @@ public:
   virtual void release (void);
 
   /// Push <event> to this consumer.
-  void push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  virtual void push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+
+  /// Push <event> to this consumer.
+  virtual void push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
   virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index e0e9bf7b71b..bc643f11b68 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -95,9 +95,9 @@ TAO_NS_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params, TAO_
 }
 
 void
-TAO_NS_ThreadPool_Task::exec (TAO_NS_Method_Request& method_request)
+TAO_NS_ThreadPool_Task::execute (TAO_NS_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL)
 {
-  TAO_NS_Method_Request& request_copy = *method_request.copy ();
+  TAO_NS_Method_Request& request_copy = *method_request.copy (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   if (this->buffering_strategy_->enqueue (request_copy) == -1)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
index 88c6b33462f..46ea7570770 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
@@ -57,7 +57,7 @@ public:
   void init (const NotifyExt::ThreadPoolParams& tp_params, TAO_NS_AdminProperties_var& admin_properties ACE_ENV_ARG_DECL);
 
   /// Queue the request
-  virtual void exec (TAO_NS_Method_Request& method_request);
+  virtual void execute (TAO_NS_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL);
 
   /// Shutdown task
   virtual void shutdown (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
index 2eef3710451..082994f3511 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
@@ -47,7 +47,7 @@ public:
 
   ///= Public method to be implemented by subclasses.
   /// Exec the request.
-  virtual void exec (TAO_NS_Method_Request& method_request) = 0;
+  virtual void execute (TAO_NS_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL) = 0;
 
   /// Shutdown task
   virtual void shutdown (void) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/NotifyExt.idl b/TAO/orbsvcs/orbsvcs/NotifyExt.idl
index d21979e6f0f..7c94e9bcb26 100644
--- a/TAO/orbsvcs/orbsvcs/NotifyExt.idl
+++ b/TAO/orbsvcs/orbsvcs/NotifyExt.idl
@@ -27,6 +27,12 @@ module NotifyExt
   const Priority minPriority = 0;
   const Priority maxPriority = 32767;
 
+  enum PriorityModel
+  {
+    CLIENT_PROPAGATED,
+    SERVER_DECLARED
+  };
+
   /*
    * ThreadPool QoS property,
    */
@@ -35,6 +41,9 @@ module NotifyExt
   // ThreadPoolParams : same as RTCORBA::create_threadpool
   struct ThreadPoolParams
   {
+    PriorityModel priority_model;
+    Priority server_priority;
+
     unsigned long stacksize;
     unsigned long static_threads;
     unsigned long dynamic_threads;
@@ -51,6 +60,9 @@ module NotifyExt
 
   struct ThreadPoolLane
   {
+    PriorityModel priority_model;
+    Priority server_priority;
+
     Priority lane_priority;
     unsigned long static_threads;
     unsigned long dynamic_threads;
@@ -60,6 +72,9 @@ module NotifyExt
 
   struct ThreadPoolLanesParams
     {
+      PriorityModel priority_model;
+      Priority server_priority;
+
       unsigned long stacksize;
       ThreadPoolLanes_List lanes;
       boolean allow_borrowing;
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf b/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf
index fb727cfeae2..93b10684061 100644
--- a/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf
+++ b/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf
@@ -8,7 +8,7 @@ dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_ma
 
 dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
 
-dynamic TAO_NS_Filter_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Filter_Command_Factory () ""        
+dynamic TAO_NS_Filter_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Filter_Command_Factory () ""
 
 dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
 
@@ -16,13 +16,13 @@ dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_T
 static Command_Builder "Application -Init"
 
 ##----------- Create an RT POA to host local consumer objects-----------
-static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 4 -Lane 49 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 
 ##--------- Consumer Admin 1 -------------
 static Command_Builder "ConsumerAdmin -Create ca1 ec1 -AND_OP"
 
 ##--------- Consumer 1 , connected to CA 1 --------
-static Command_Builder "PeriodicConsumer -Create c1 ca1 -POA poa_1 -Proxy c1_proxy -MaxCount 5 -Check_Priority"
+static Command_Builder "PeriodicConsumer -Create c1 -Admin ca1 -POA poa_1 -Proxy c1_proxy -MaxCount 5 -Check_Priority"
 static Command_Builder "PeriodicConsumer -Subscription c1 +Path1"
 
 static Command_Builder "Filter -CreateFilter f_c1 ff"
@@ -32,7 +32,7 @@ static Command_Builder "Filter -Add_Constraint f_c1 'LaneId = 1'"
 static Command_Builder "Filter -Add_Filter f_c1 c1_proxy"
 
 ##--------- Consumer 2 , connected to CA 1 --------
-static Command_Builder "PeriodicConsumer -Create c2 ca1 -POA poa_1 -Proxy c2_proxy -MaxCount 5 -Check_Priority"
+static Command_Builder "PeriodicConsumer -Create c2 -Admin ca1 -POA poa_1 -Proxy c2_proxy -MaxCount 5 -Check_Priority"
 static Command_Builder "PeriodicConsumer -Subscription c2 +Path2"
 
 static Command_Builder "Filter -CreateFilter f_c2 ff"
@@ -42,7 +42,7 @@ static Command_Builder "Filter -Add_Constraint f_c2 'LaneId = 2'"
 static Command_Builder "Filter -Add_Filter f_c2 c2_proxy"
 
 ##--------- Consumer 3 , connected to CA 1 --------
-static Command_Builder "PeriodicConsumer -Create c3 ca1 -POA poa_1 -Proxy c3_proxy -MaxCount 5 -Check_Priority"
+static Command_Builder "PeriodicConsumer -Create c3 -Admin ca1 -POA poa_1 -Proxy c3_proxy -MaxCount 5 -Check_Priority"
 static Command_Builder "PeriodicConsumer -Subscription c3 +Path3"
 
 static Command_Builder "Filter -CreateFilter f_c3 ff"
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
index ad483a8cd55..ca598749030 100755
--- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
@@ -24,6 +24,7 @@ $Naming = new PerlACE::Process ("../../../Naming_Service/Naming_Service",
 $Notification = new PerlACE::Process ("../../../Notify_Service/Notify_Service");
 
 $Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf";
+#$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf -ORBDebugLevel 1";
 
 $Supplier = new PerlACE::Process ("../Driver/Notify_Tests_Driver");
 
@@ -32,6 +33,7 @@ $Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplie
 $Consumer = new PerlACE::Process ("../Driver/Notify_Tests_Driver");
 
 $Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf";
+#$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1";
 
 unlink $naming_ior;
 $Naming->Spawn ();
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf b/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf
index 55da7ac14cc..60085f0ed5a 100644
--- a/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf
@@ -3,12 +3,12 @@
 ## EventChannel ec1 with 1 Thread
 ## SupplierAdmim sa1 with 1 Thread
 ## SupplierAdmin sa2
-## 
+##
 ## Supplier s1 has 1 Thread and is connected to sa1
 ## Supplier s2 is connected to sa1
-## 
+##
 ## Supplier s3 is connected to sa2
-## 
+##
 
 ##---- Load the Factories------
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
@@ -19,21 +19,21 @@ dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_mak
 dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
 
 dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
-dynamic TAO_NS_Filter_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Filter_Command_Factory () ""        
+dynamic TAO_NS_Filter_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Filter_Command_Factory () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
 static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 49 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
 static Command_Builder "Filter -CreateFactory ff ec1"
 
 ### --- Create Supplier Admin 1 ----
 static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
 
 ### --- Create Supplier s1 connected to sa1. -----
-static Command_Builder "PeriodicSupplier -Create s1 sa1 -Proxy s1_proxy -EventType Path1 -Priority 1 -Period 10000 -ExecTime 10000 -Phase 0 -Iter 5 -Load 1 "
+static Command_Builder "PeriodicSupplier -Create s1 -Admin sa1 -Proxy s1_proxy -EventType Path1 -Priority 1 -Period 10000 -ExecTime 10000 -Phase 0 -Iter 5 -Load 1 "
 
 static Command_Builder "Filter -CreateFilter f1 ff"
 static Command_Builder "Filter -Add_Constraint f1 'PoolId = 1'"
@@ -41,7 +41,7 @@ static Command_Builder "Filter -Add_Constraint f1 'LaneId = 1'"
 static Command_Builder "Filter -Add_Filter f1 s1_proxy"
 
 ### --- Create Supplier s2 connected to sa1 ----
-static Command_Builder "PeriodicSupplier -Create s2 sa1 -Proxy s2_proxy -EventType Path2 -Priority 2 -Period 10000 -ExecTime 10000 -Phase 0 -Iter 5 -Load 1 "
+static Command_Builder "PeriodicSupplier -Create s2 -Admin sa1 -Proxy s2_proxy -EventType Path2 -Priority 2 -Period 10000 -ExecTime 10000 -Phase 0 -Iter 5 -Load 1 "
 
 static Command_Builder "Filter -CreateFilter f2 ff"
 static Command_Builder "Filter -Add_Constraint f2 'PoolId = 1'"
@@ -49,7 +49,7 @@ static Command_Builder "Filter -Add_Constraint f2 'LaneId = 2'"
 static Command_Builder "Filter -Add_Filter f2 s2_proxy"
 
 ### --- Create Supplier s3 connected to sa2 ----
-static Command_Builder "PeriodicSupplier -Create s3 sa1 -Proxy s3_proxy -EventType Path3 -Priority 3 -Period 10000 -ExecTime 10000 -Phase 0 -Iter 5 -Load 1 "
+static Command_Builder "PeriodicSupplier -Create s3 -Admin sa1 -Proxy s3_proxy -EventType Path3 -Priority 3 -Period 10000 -ExecTime 10000 -Phase 0 -Iter 5 -Load 1 "
 static Command_Builder "Filter -CreateFilter f3 ff"
 static Command_Builder "Filter -Add_Constraint f3 'PoolId = 1'"
 static Command_Builder "Filter -Add_Constraint f3 'LaneId = 3'"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/.depend.Makefile b/TAO/orbsvcs/tests/Notify/RT_lib/.depend.Makefile
index 78d3ea2967c..e1360726326 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/.depend.Makefile
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/.depend.Makefile
@@ -277,7 +277,6 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
@@ -580,7 +579,6 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
@@ -875,7 +873,6 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile
index 3447538f730..0c4ccf5883c 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile
@@ -1,81 +1,69 @@
-#$Id$
 #----------------------------------------------------------------------------
-#       GNU Makefile
+#
+# $Id$
+#
 #----------------------------------------------------------------------------
-MAKEFILE        = Makefile
-DEPENDENCY_FILE = .depend.Makefile
-LIB_UNCHECKED   = libTAO_RT_NotifyTests.a
-SHLIB_UNCHECKED = libTAO_RT_NotifyTests.$(SOEXT)
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
-endif
+endif # ! TAO_ROOT
+
+MAKEFILE = Makefile
+DEPENDENCY_FILE = .depend.Makefile
+LIBNAME  = libTAO_RT_NotifyTests
+LIB2      = $(LIBNAME).a
+SHLIB2    = $(LIBNAME).$(SOEXT)
+
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 
-IDL_FILES =
-IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext)))
+ifeq (RT_Notify,$(findstring RT_Notify,$(TAO_ORBSVCS)))
+  LIB = $(LIB2)
+  SHLIB = $(SHLIB2)
+endif # RT_Notify
 
+TAO_IDLFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -Ge 1 -Sc
+
+ACE_SHLIBS =  -lTAO_RTCORBA -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO $(ACELIB)
 
-FILES = \
+LDLIBS =  -lTAO_RTCORBA -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO $(ACELIB)
+
+SRCS = \
   RT_Application_Command \
   RT_POA_Command \
   RT_Priority_Mapping \
   RT_Factories_Define
 
-CURRENT_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+FILES = $(SRCS)
+DEFS  = $(addsuffix .h,$(FILES))
+LSRC  = $(addsuffix .cpp,$(FILES))
+
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-ifeq ($(rt_corba),1)
-ifeq (Notify, $(findstring Notify, $(CURRENT_COMPONENTS)))
-ifeq (Naming, $(findstring Naming, $(CURRENT_COMPONENTS)))
-LIB   = $(LIB_UNCHECKED)
-SHLIB = $(SHLIB_UNCHECKED)
-endif
-endif
-endif #rt_corba
-LSRC   = $(addsuffix .cpp, $(FILES))
-ACELIB = -lACE
 
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
-
-CPPFLAGS     += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(ACE_ROOT)
-ifeq ($(shared_libs),1)
-ifneq ($(SHLIB),)
-CPPFLAGS     += -DTAO_RT_NOTIFY_TEST_BUILD_DLL
-endif
-endif
-ifeq ($(static_libs),1)
-ifneq ($(LIB),)
-CPPFLAGS     += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
-endif
-endif
-
-
-LDFLAGS      += -L$(TAO_ROOT)/tao/PortableServer -L$(TAO_ROOT)/tao/DynamicAny -L$(TAO_ROOT)/tao/IORTable -L$(TAO_ROOT)/orbsvcs/orbsvcs/ETCL -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace 
-TAO_IDLFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -Ge 1 -Sc
 
 #----------------------------------------------------------------------------
-#       Local targets
+#       Local targets (and local hacks)
 #----------------------------------------------------------------------------
 
-ADDITIONAL_IDL_TARGETS =
-
-# IDL File Directory: .
+LDFLAGS  += -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
 
-idl_stubs: $(ADDITIONAL_IDL_TARGETS)
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
 
-all: idl_stubs
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.PRECIOUS: $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext)))
 
-realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext)))
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
index ee79552a2b0..636ac66e82d 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
@@ -1,11 +1,13 @@
 
-project(TAO_RT_NotifyTests): orbsvcslib, notify {
+project(TAO_RT_NotifyTests): orbsvcslib {
 
   depends    += TAO_NotifyTests RTPortableServer RTCORBA
   sharedname = TAO_RT_NotifyTests
   libs       += TAO_NotifyTests TAO_RTCORBA TAO_RTPortableServer
   requires += rt_corba
 
+  includes += $(TAO_ROOT)
+
   libpaths += $(TAO_ROOT)/tao/RTCORBA
   libpaths += $(TAO_ROOT)/tao/RTPortableServer
   libpaths += $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index 561eb2ef037..fbb7535ee47 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -326,6 +326,10 @@ TAO_NS_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_pt
 
   CORBA::PolicyList poa_policy_list;
 
+  CORBA::Policy_var activation_policy =
+    parent_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
   if (lanes_.length () == 0 && thread_pool_static_threads_ == 0 && bands_.length () == 0)
     {
       poa_policy_list.length (1);
@@ -364,6 +368,12 @@ TAO_NS_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_pt
       poa_policy_list[2] = lanes_policy;
     }
 
+  // Add the activation policy
+  int act_index = poa_policy_list.length ();
+  poa_policy_list.length (act_index + 1);
+
+  poa_policy_list[act_index] = activation_policy;
+
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "creating POA %s\n", POA_name_.c_str ()));
 
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/.depend.Makefile b/TAO/orbsvcs/tests/Notify/Test_Filter/.depend.Makefile
index 06bfa261d67..abe5f03d906 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/.depend.Makefile
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/.depend.Makefile
@@ -277,7 +277,6 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
@@ -338,6 +337,10 @@
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -712,7 +715,6 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile
index e62ba17f3bb..639c798aa16 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile
@@ -1,80 +1,66 @@
-#$Id$
 #----------------------------------------------------------------------------
-#       GNU Makefile
+#
+# $Id$
+#
 #----------------------------------------------------------------------------
-MAKEFILE        = Makefile
-DEPENDENCY_FILE = .depend.Makefile
-LIB_UNCHECKED   = libTAO_RT_NotifyTests_Filter.a
-SHLIB_UNCHECKED = libTAO_RT_NotifyTests_Filter.$(SOEXT)
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
-endif
+endif # ! TAO_ROOT
+
+MAKEFILE = Makefile
+DEPENDENCY_FILE = .depend.Makefile
+LIBNAME  = libTAO_RT_NotifyTests_Filter
+LIB2      = $(LIBNAME).a
+SHLIB2    = $(LIBNAME).$(SOEXT)
 
-IDL_FILES =
-IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext)))
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 
+ifeq (RT_Notify,$(findstring RT_Notify,$(TAO_ORBSVCS)))
+  LIB = $(LIB2)
+  SHLIB = $(SHLIB2)
+endif # RT_Notify
+
+TAO_IDLFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -Ge 1 -Sc
 
-FILES = \
+ACE_SHLIBS =  -lTAO_RTCORBA -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO $(ACELIB)
+
+LDLIBS =  -lTAO_RTCORBA -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO $(ACELIB)
+
+SRCS = \
   RT_Test_Filter \
   RT_Test_FilterFactory
 
-CURRENT_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+FILES = $(SRCS)
+DEFS  = $(addsuffix .h,$(FILES))
+LSRC  = $(addsuffix .cpp,$(FILES))
+
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-
-ifeq ($(rt_corba),1)
-ifeq (Notify, $(findstring Notify, $(CURRENT_COMPONENTS)))
-ifeq (Naming, $(findstring Naming, $(CURRENT_COMPONENTS)))
-LIB   = $(LIB_UNCHECKED)
-SHLIB = $(SHLIB_UNCHECKED)
-endif
-endif
-endif # ami
-LSRC   = $(addsuffix .cpp, $(FILES))
-ACELIB = -lACE
 
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-include $(TAO_ROOT)/orbsvcs/tests/Notify/notify_tests.GNU
-
-CPPFLAGS     += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(ACE_ROOT)
-ifeq ($(shared_libs),1)
-ifneq ($(SHLIB),)
-CPPFLAGS     += -DTAO_NOTIFY_TEST_BUILD_DLL
-endif
-endif
-ifeq ($(static_libs),1)
-ifneq ($(LIB),)
-CPPFLAGS     += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
-endif
-endif
-
-
-LDFLAGS      += -L$(TAO_ROOT)/tao/PortableServer -L$(TAO_ROOT)/tao/DynamicAny -L$(TAO_ROOT)/tao/IORTable -L$(TAO_ROOT)/orbsvcs/orbsvcs/ETCL -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
-TAO_IDLFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -Ge 1 -Sc
 
 #----------------------------------------------------------------------------
-#       Local targets
+#       Local targets (and local hacks)
 #----------------------------------------------------------------------------
 
-ADDITIONAL_IDL_TARGETS =
+LDFLAGS  += -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
 
-# IDL File Directory: .
-
-idl_stubs: $(ADDITIONAL_IDL_TARGETS)
-
-all: idl_stubs
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
 
-.PRECIOUS: $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext)))
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext)))
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Notify/lib/.depend.Makefile b/TAO/orbsvcs/tests/Notify/lib/.depend.Makefile
index de5c9f0b996..1fccf6de3a6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/.depend.Makefile
+++ b/TAO/orbsvcs/tests/Notify/lib/.depend.Makefile
@@ -2,373 +2,6 @@
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/Activation_Manager.o .obj/Activation_Manager.so .shobj/Activation_Manager.o .shobj/Activation_Manager.so: Activation_Manager.cpp Activation_Manager.h \
-  $(ACE_ROOT)/ace/pre.h \
-  notify_test_export.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(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/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(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 \
-  Task_Callback.h Periodic_Supplier.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(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 \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  Notify_StructuredPushSupplier.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
-  $(TAO_ROOT)/tao/corba.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_Impl_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/Any_Impl_T.inl \
-  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
-  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
-  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
-  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
-  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
-  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
-  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
-  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
-  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
-  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
-  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
-  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
-  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
-  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
-  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
-  $(TAO_ROOT)/tao/NVList.h \
-  $(TAO_ROOT)/tao/NVList.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/Principal.h \
-  $(TAO_ROOT)/tao/Principal.i \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/BoundsC.h \
-  $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/DomainC.h \
-  $(TAO_ROOT)/tao/DomainC.i \
-  $(TAO_ROOT)/tao/WrongTransactionC.h \
-  $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Array_VarOut_T.h \
-  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/PI_ForwardC.h \
-  $(TAO_ROOT)/tao/PI_ForwardC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
-  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
-  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
-  $(ACE_ROOT)/ace/Atomic_Op.i \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
-  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
-  Task_Stats.h Task_Stats.inl StructuredEvent.h Periodic_Consumer.h \
-  Notify_StructuredPushConsumer.h Activation_ManagerS.h \
-  Activation_ManagerC.h Activation_ManagerC.i Activation_ManagerS.i \
-  LookupManager.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
-  Command_Builder.h Name.h
-
 .obj/Activation_ManagerC.o .obj/Activation_ManagerC.so .shobj/Activation_ManagerC.o .shobj/Activation_ManagerC.so: Activation_ManagerC.cpp Activation_ManagerC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -661,6 +294,10 @@
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1074,6 +711,10 @@
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -1100,6 +741,8 @@
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Refcounted_ObjectKey.h \
+  $(TAO_ROOT)/tao/Refcounted_ObjectKey.inl \
   $(TAO_ROOT)/tao/Profile.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
@@ -1119,13 +762,14 @@
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Application_Command.o .obj/Application_Command.so .shobj/Application_Command.o .shobj/Application_Command.so: Application_Command.cpp Application_Command.h \
+.obj/Peer.o .obj/Peer.so .shobj/Peer.o .shobj/Peer.so: Peer.cpp Peer.h \
   $(ACE_ROOT)/ace/pre.h \
   notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1142,19 +786,10 @@
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -1168,22 +803,6 @@
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -1199,6 +818,10 @@
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
@@ -1218,10 +841,12 @@
   $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
@@ -1267,62 +892,64 @@
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_Impl_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/Any_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  Command.h \
-  $(ACE_ROOT)/ace/Arg_Shifter.h \
-  $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
@@ -1344,6 +971,21 @@
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/Principal.h \
   $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
   $(TAO_ROOT)/tao/DomainC.h \
@@ -1367,11 +1009,25 @@
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  LookupManager.h \
+  Peer.inl \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  Name.h LookupManager.h \
   $(ACE_ROOT)/ace/Singleton.h \
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
@@ -1385,121 +1041,29 @@
   $(ACE_ROOT)/ace/Framework_Component_T.h \
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  Name.h Activation_Manager.h Task_Callback.h Periodic_Supplier.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  Notify_StructuredPushSupplier.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
-  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
-  $(ACE_ROOT)/ace/Atomic_Op.i \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
-  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
-  Task_Stats.h Task_Stats.inl StructuredEvent.h Periodic_Consumer.h \
-  Notify_StructuredPushConsumer.h Activation_ManagerS.h \
-  Activation_ManagerC.h Activation_ManagerC.i Activation_ManagerS.i \
-  Driver_Base.h Priority_Mapping.h
+  Options_Parser.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i
 
-.obj/Command.o .obj/Command.so .shobj/Command.o .shobj/Command.so: Command.cpp Command.h \
+.obj/StructuredPushConsumer.o .obj/StructuredPushConsumer.so .shobj/StructuredPushConsumer.o .shobj/StructuredPushConsumer.so: StructuredPushConsumer.cpp \
+  StructuredPushConsumer.h \
   $(ACE_ROOT)/ace/pre.h \
   notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Arg_Shifter.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
@@ -1734,58 +1298,131 @@
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.i \
+  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Consumer_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  Name.h LookupManager.h \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  Options_Parser.h Consumer_T.inl Consumer_T.cpp \
+  StructuredPushConsumer.inl
 
-.obj/Command_Builder.o .obj/Command_Builder.so .shobj/Command_Builder.o .shobj/Command_Builder.so: Command_Builder.cpp Command_Builder.h \
+.obj/SequencePushConsumer.o .obj/SequencePushConsumer.so .shobj/SequencePushConsumer.o .shobj/SequencePushConsumer.so: SequencePushConsumer.cpp SequencePushConsumer.h \
   $(ACE_ROOT)/ace/pre.h \
   notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -1797,9 +1434,15 @@
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
@@ -1811,6 +1454,26 @@
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -1849,113 +1512,64 @@
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/iosfwd.h \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
   $(TAO_ROOT)/tao/Sequence.i \
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_Impl_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/Any_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(ACE_ROOT)/ace/Arg_Shifter.h \
-  $(ACE_ROOT)/ace/Get_Opt.h \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Get_Opt.i \
-  Command.h \
-  $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
@@ -1977,6 +1591,21 @@
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/Principal.h \
   $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
   $(TAO_ROOT)/tao/DomainC.h \
@@ -2000,65 +1629,129 @@
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  Command_Factory.h Name.h
-
-.obj/Command_Factory.o .obj/Command_Factory.so .shobj/Command_Factory.o .shobj/Command_Factory.so: Command_Factory.cpp Command_Factory.h \
-  $(ACE_ROOT)/ace/pre.h \
-  notify_test_export.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.i \
+  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Consumer_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  Name.h LookupManager.h \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  Options_Parser.h Consumer_T.inl Consumer_T.cpp SequencePushConsumer.inl
 
-.obj/Command_Factory_T.o .obj/Command_Factory_T.so .shobj/Command_Factory_T.o .shobj/Command_Factory_T.so: Command_Factory_T.cpp Command_Factory_T.h \
+.obj/PushConsumer.o .obj/PushConsumer.so .shobj/PushConsumer.o .shobj/PushConsumer.so: PushConsumer.cpp PushConsumer.h \
   $(ACE_ROOT)/ace/pre.h \
   notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -2070,9 +1763,15 @@
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
@@ -2084,6 +1783,26 @@
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -2122,74 +1841,87 @@
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  Command_Factory.h Command_Factory_T.cpp \
-  $(ACE_ROOT)/ace/Dynamic_Service.h \
-  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
-  $(ACE_ROOT)/ace/Dynamic_Service.i \
-  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  Command_Builder.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/iosfwd.h \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
   $(TAO_ROOT)/tao/Sequence.i \
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Seq_Var_T.h \
   $(TAO_ROOT)/tao/Seq_Var_T.inl \
   $(TAO_ROOT)/tao/Seq_Var_T.cpp \
   $(TAO_ROOT)/tao/Seq_Out_T.h \
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/VarOut_T.h \
   $(TAO_ROOT)/tao/VarOut_T.inl \
   $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -2198,70 +1930,158 @@
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_Impl_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/Any_Impl_T.inl \
-  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
-  Name.h
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.i \
+  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Consumer_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  Name.h LookupManager.h \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  Options_Parser.h Consumer_T.inl Consumer_T.cpp PushConsumer.inl
 
-.obj/ConsumerAdmin_Command.o .obj/ConsumerAdmin_Command.so .shobj/ConsumerAdmin_Command.o .shobj/ConsumerAdmin_Command.so: ConsumerAdmin_Command.cpp \
-  ConsumerAdmin_Command.h \
+.obj/StructuredPushSupplier.o .obj/StructuredPushSupplier.so .shobj/StructuredPushSupplier.o .shobj/StructuredPushSupplier.so: StructuredPushSupplier.cpp \
+  StructuredPushSupplier.h \
   $(ACE_ROOT)/ace/pre.h \
   notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -2273,13 +2093,15 @@
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
@@ -2291,6 +2113,26 @@
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -2309,37 +2151,11 @@
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
-  $(TAO_ROOT)/tao/corba.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -2473,21 +2289,66 @@
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.i \
+  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
-  Command.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Supplier_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
   $(ACE_ROOT)/ace/Arg_Shifter.h \
-  LookupManager.h \
+  Name.h LookupManager.h \
   $(ACE_ROOT)/ace/Singleton.h \
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
@@ -2501,66 +2362,56 @@
   $(ACE_ROOT)/ace/Framework_Component_T.h \
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  Name.h Options_Parser.h
+  Options_Parser.h Supplier_T.inl Supplier_T.cpp \
+  StructuredPushSupplier.inl
 
-.obj/Driver.o .obj/Driver.so .shobj/Driver.o .shobj/Driver.so: Driver.cpp Driver.h \
+.obj/SequencePushSupplier.o .obj/SequencePushSupplier.so .shobj/SequencePushSupplier.o .shobj/SequencePushSupplier.so: SequencePushSupplier.cpp SequencePushSupplier.h \
   $(ACE_ROOT)/ace/pre.h \
   notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -2572,9 +2423,15 @@
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
@@ -2586,6 +2443,26 @@
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -2624,76 +2501,6 @@
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(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 \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(TAO_ROOT)/tao/corba.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
@@ -2706,6 +2513,11 @@
   $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -2806,78 +2618,12 @@
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  Driver_Base.h \
-  $(ACE_ROOT)/ace/Dynamic_Service.h \
-  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
-  $(ACE_ROOT)/ace/Dynamic_Service.i \
-  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
-  $(ACE_ROOT)/ace/Arg_Shifter.h \
-  $(ACE_ROOT)/ace/Argv_Type_Converter.h \
-  $(ACE_ROOT)/ace/Argv_Type_Converter.inl \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(ACE_ROOT)/ace/Sched_Params.h \
-  $(ACE_ROOT)/ace/Sched_Params.i \
-  LookupManager.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  Command_Builder.h Name.h Activation_Manager.h Task_Callback.h \
-  Periodic_Supplier.h Notify_StructuredPushSupplier.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
@@ -2897,68 +2643,104 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
-  Task_Stats.h Task_Stats.inl StructuredEvent.h Periodic_Consumer.h \
-  Notify_StructuredPushConsumer.h Activation_ManagerS.h \
-  Activation_ManagerC.h Activation_ManagerC.i Activation_ManagerS.i
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Supplier_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  Name.h LookupManager.h \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  Options_Parser.h Supplier_T.inl Supplier_T.cpp SequencePushSupplier.inl
 
-.obj/EventChannel_Command.o .obj/EventChannel_Command.so .shobj/EventChannel_Command.o .shobj/EventChannel_Command.so: EventChannel_Command.cpp EventChannel_Command.h \
+.obj/PushSupplier.o .obj/PushSupplier.so .shobj/PushSupplier.o .shobj/PushSupplier.so: PushSupplier.cpp PushSupplier.h \
   $(ACE_ROOT)/ace/pre.h \
   notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -2970,13 +2752,15 @@
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
@@ -2988,6 +2772,26 @@
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -3006,37 +2810,11 @@
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
-  $(TAO_ROOT)/tao/corba.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -3170,21 +2948,66 @@
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.i \
+  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
-  Command.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Supplier_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
   $(ACE_ROOT)/ace/Arg_Shifter.h \
-  LookupManager.h \
+  Name.h LookupManager.h \
   $(ACE_ROOT)/ace/Singleton.h \
   $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
@@ -3198,42 +3021,32 @@
   $(ACE_ROOT)/ace/Framework_Component_T.h \
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  Name.h Options_Parser.h
+  Options_Parser.h Supplier_T.inl Supplier_T.cpp PushSupplier.inl
 
-.obj/Factories_Define.o .obj/Factories_Define.so .shobj/Factories_Define.o .shobj/Factories_Define.so: Factories_Define.cpp Factories_Define.h \
+.obj/Direct_Consumer.o .obj/Direct_Consumer.so .shobj/Direct_Consumer.o .shobj/Direct_Consumer.so: Direct_Consumer.cpp Direct_Consumer.h \
   $(ACE_ROOT)/ace/pre.h \
-  Command_Factory_T.h notify_test_export.h \
+  notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/OS_Memory.h \
+  Periodic_Consumer.h Task_Stats.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
@@ -3244,19 +3057,31 @@
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -3269,20 +3094,52 @@
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  Task_Stats.inl \
+  $(ACE_ROOT)/ace/High_Res_Timer.h \
+  $(ACE_ROOT)/ace/High_Res_Timer.i \
+  Notify_StructuredPushConsumer.h StructuredPushConsumer.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -3321,109 +3178,63 @@
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  Command_Factory.h Command_Factory_T.cpp \
-  $(ACE_ROOT)/ace/Dynamic_Service.h \
-  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
-  $(ACE_ROOT)/ace/Dynamic_Service.i \
-  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  Command_Builder.h \
+  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/iosfwd.h \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
   $(TAO_ROOT)/tao/Sequence.i \
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_Impl_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/Any_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  Name.h EventChannel_Command.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
-  $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
@@ -3445,6 +3256,21 @@
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/Principal.h \
   $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
   $(TAO_ROOT)/tao/DomainC.h \
@@ -3469,60 +3295,161 @@
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.i \
+  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
-  Command.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Consumer_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
   $(ACE_ROOT)/ace/Arg_Shifter.h \
-  Application_Command.h SupplierAdmin_Command.h ConsumerAdmin_Command.h \
-  Periodic_Supplier_Command.h Periodic_Consumer_Command.h \
-  Filter_Command.h
+  Name.h LookupManager.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  Options_Parser.h Consumer_T.inl Consumer_T.cpp \
+  StructuredPushConsumer.inl
 
-.obj/Filter_Command.o .obj/Filter_Command.so .shobj/Filter_Command.o .shobj/Filter_Command.so: Filter_Command.cpp Filter_Command.h \
+.obj/Direct_Supplier.o .obj/Direct_Supplier.so .shobj/Direct_Supplier.o .shobj/Direct_Supplier.so: Direct_Supplier.cpp Direct_Supplier.h \
   $(ACE_ROOT)/ace/pre.h \
   notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
+  Periodic_Supplier.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
@@ -3535,34 +3462,67 @@
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Notification_Strategy.h \
+  $(ACE_ROOT)/ace/Notification_Strategy.inl \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  Notify_StructuredPushSupplier.h StructuredPushSupplier.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
   $(ACE_ROOT)/ace/Malloc_T.i \
   $(ACE_ROOT)/ace/Malloc_T.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
   $(ACE_ROOT)/ace/Signal.h \
   $(ACE_ROOT)/ace/Signal.i \
   $(ACE_ROOT)/ace/Mem_Map.h \
@@ -3571,37 +3531,11 @@
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
-  $(TAO_ROOT)/tao/corba.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -3616,7 +3550,6 @@
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
@@ -3629,11 +3562,6 @@
   $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -3735,53 +3663,83 @@
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.i \
+  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
-  Command.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Supplier_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
   $(ACE_ROOT)/ace/Arg_Shifter.h \
-  LookupManager.h \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(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 \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  Name.h LookupManager.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  Name.h
+  Options_Parser.h Supplier_T.inl Supplier_T.cpp \
+  StructuredPushSupplier.inl Task_Stats.h Task_Stats.inl \
+  $(ACE_ROOT)/ace/High_Res_Timer.h \
+  $(ACE_ROOT)/ace/High_Res_Timer.i \
+  StructuredEvent.h Direct_Supplier.inl
 
-.obj/LookupManager.o .obj/LookupManager.so .shobj/LookupManager.o .shobj/LookupManager.so: LookupManager.cpp LookupManager.h \
+.obj/Relay_Consumer.o .obj/Relay_Consumer.so .shobj/Relay_Consumer.o .shobj/Relay_Consumer.so: Relay_Consumer.cpp Relay_Consumer.h \
   $(ACE_ROOT)/ace/pre.h \
   notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
+  Direct_Consumer.h Periodic_Consumer.h Task_Stats.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Export.h \
@@ -3790,6 +3748,7 @@
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_Memory.h \
@@ -3804,6 +3763,8 @@
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -3842,33 +3803,21 @@
   $(ACE_ROOT)/ace/Framework_Component_T.h \
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  Task_Stats.inl \
+  $(ACE_ROOT)/ace/High_Res_Timer.h \
+  $(ACE_ROOT)/ace/High_Res_Timer.i \
+  Notify_StructuredPushConsumer.h StructuredPushConsumer.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
@@ -3884,6 +3833,7 @@
   $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
@@ -3935,17 +3885,35 @@
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/iosfwd.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
@@ -3968,28 +3936,14 @@
   $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_Impl_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/Any_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
-  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
-  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
-  $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
   $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
@@ -3999,6 +3953,9 @@
   $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
   $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -4013,6 +3970,12 @@
   $(TAO_ROOT)/tao/ObjectIdListC.h \
   $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
@@ -4038,73 +4001,110 @@
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.i \
+  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Consumer_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  Name.h LookupManager.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  Name.h
+  Options_Parser.h Consumer_T.inl Consumer_T.cpp \
+  StructuredPushConsumer.inl
 
-.obj/Name.o .obj/Name.so .shobj/Name.o .shobj/Name.so: Name.cpp Name.h \
+.obj/Activation_Manager.o .obj/Activation_Manager.so .shobj/Activation_Manager.o .shobj/Activation_Manager.so: Activation_Manager.cpp Activation_Manager.h \
   $(ACE_ROOT)/ace/pre.h \
   notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl
-
-.obj/Notify_PushConsumer.o .obj/Notify_PushConsumer.so .shobj/Notify_PushConsumer.o .shobj/Notify_PushConsumer.so: Notify_PushConsumer.cpp Notify_PushConsumer.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
-  $(TAO_ROOT)/tao/corba.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -4116,15 +4116,13 @@
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
@@ -4136,26 +4134,6 @@
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -4174,11 +4152,29 @@
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -4194,6 +4190,73 @@
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Task_Callback.h Periodic_Supplier.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Notification_Strategy.h \
+  $(ACE_ROOT)/ace/Notification_Strategy.inl \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  Notify_StructuredPushSupplier.h StructuredPushSupplier.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
   $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
@@ -4206,11 +4269,6 @@
   $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -4337,7 +4395,6 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
@@ -4368,17 +4425,30 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
-  notify_test_export.h
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Supplier_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  Name.h LookupManager.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+  Options_Parser.h Supplier_T.inl Supplier_T.cpp \
+  StructuredPushSupplier.inl Task_Stats.h Task_Stats.inl \
+  $(ACE_ROOT)/ace/High_Res_Timer.h \
+  $(ACE_ROOT)/ace/High_Res_Timer.i \
+  StructuredEvent.h Periodic_Consumer.h Notify_StructuredPushConsumer.h \
+  StructuredPushConsumer.h Consumer_T.h Consumer_T.inl Consumer_T.cpp \
+  StructuredPushConsumer.inl Activation_ManagerS.h Activation_ManagerC.h \
+  Activation_ManagerC.i Activation_ManagerS.i Command_Builder.h
 
-.obj/Notify_PushSupplier.o .obj/Notify_PushSupplier.so .shobj/Notify_PushSupplier.o .shobj/Notify_PushSupplier.so: Notify_PushSupplier.cpp Notify_PushSupplier.h \
+.obj/Application_Command.o .obj/Application_Command.so .shobj/Application_Command.o .shobj/Application_Command.so: Application_Command.cpp Application_Command.h \
   $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
-  $(TAO_ROOT)/tao/corba.h \
+  notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -4395,10 +4465,19 @@
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -4412,6 +4491,22 @@
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -4427,10 +4522,6 @@
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
@@ -4450,12 +4541,10 @@
   $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
@@ -4501,64 +4590,62 @@
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_Impl_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Seq_Var_T.h \
   $(TAO_ROOT)/tao/Seq_Var_T.inl \
   $(TAO_ROOT)/tao/Seq_Var_T.cpp \
   $(TAO_ROOT)/tao/Seq_Out_T.h \
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/VarOut_T.h \
   $(TAO_ROOT)/tao/VarOut_T.inl \
   $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/Any_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  Command.h \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
@@ -4580,21 +4667,6 @@
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/Principal.h \
   $(TAO_ROOT)/tao/Principal.i \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
   $(TAO_ROOT)/tao/DomainC.h \
@@ -4618,12 +4690,81 @@
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  LookupManager.h \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  Name.h Activation_Manager.h Task_Callback.h Periodic_Supplier.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Notification_Strategy.h \
+  $(ACE_ROOT)/ace/Notification_Strategy.inl \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  Notify_StructuredPushSupplier.h StructuredPushSupplier.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
@@ -4643,54 +4784,52 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
-  notify_test_export.h
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Supplier_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
+  Options_Parser.h Supplier_T.inl Supplier_T.cpp \
+  StructuredPushSupplier.inl Task_Stats.h Task_Stats.inl \
+  $(ACE_ROOT)/ace/High_Res_Timer.h \
+  $(ACE_ROOT)/ace/High_Res_Timer.i \
+  StructuredEvent.h Periodic_Consumer.h Notify_StructuredPushConsumer.h \
+  StructuredPushConsumer.h Consumer_T.h Consumer_T.inl Consumer_T.cpp \
+  StructuredPushConsumer.inl Activation_ManagerS.h Activation_ManagerC.h \
+  Activation_ManagerC.i Activation_ManagerS.i Driver_Base.h \
+  Priority_Mapping.h
 
-.obj/Notify_SequencePushConsumer.o .obj/Notify_SequencePushConsumer.so .shobj/Notify_SequencePushConsumer.o .shobj/Notify_SequencePushConsumer.so: Notify_SequencePushConsumer.cpp \
-  Notify_SequencePushConsumer.h \
+.obj/Command.o .obj/Command.so .shobj/Command.o .shobj/Command.so: Command.cpp Command.h \
   $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
-  $(TAO_ROOT)/tao/corba.h \
+  notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
@@ -4925,109 +5064,331 @@
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
-  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
-  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
-  $(ACE_ROOT)/ace/Atomic_Op.i \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
-  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
-  notify_test_export.h
+  $(TAO_ROOT)/tao/PortableInterceptorC.i
 
-.obj/Notify_SequencePushSupplier.o .obj/Notify_SequencePushSupplier.so .shobj/Notify_SequencePushSupplier.o .shobj/Notify_SequencePushSupplier.so: Notify_SequencePushSupplier.cpp \
-  Notify_SequencePushSupplier.h \
+.obj/Command_Builder.o .obj/Command_Builder.so .shobj/Command_Builder.o .shobj/Command_Builder.so: Command_Builder.cpp Command_Builder.h \
   $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
-  $(TAO_ROOT)/tao/corba.h \
+  notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(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/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(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/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
   $(TAO_ROOT)/tao/orbconf.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  $(ACE_ROOT)/ace/Get_Opt.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Get_Opt.i \
+  Command.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  Command_Factory.h Name.h
+
+.obj/Command_Factory.o .obj/Command_Factory.so .shobj/Command_Factory.o .shobj/Command_Factory.so: Command_Factory.cpp Command_Factory.h \
+  $(ACE_ROOT)/ace/pre.h \
+  notify_test_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl
+
+.obj/Command_Factory_T.o .obj/Command_Factory_T.so .shobj/Command_Factory_T.o .shobj/Command_Factory_T.so: Command_Factory_T.cpp Command_Factory_T.h \
+  $(ACE_ROOT)/ace/pre.h \
+  notify_test_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -5039,15 +5400,215 @@
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(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/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(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/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  Command_Factory.h Command_Factory_T.cpp \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  Command_Builder.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i Name.h
+
+.obj/ConsumerAdmin_Command.o .obj/ConsumerAdmin_Command.so .shobj/ConsumerAdmin_Command.o .shobj/ConsumerAdmin_Command.so: ConsumerAdmin_Command.cpp \
+  ConsumerAdmin_Command.h \
+  $(ACE_ROOT)/ace/pre.h \
+  notify_test_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
@@ -5059,14 +5620,265 @@
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(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/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
+  Command.h \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  LookupManager.h \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  Name.h Options_Parser.h
+
+.obj/Driver.o .obj/Driver.so .shobj/Driver.o .shobj/Driver.so: Driver.cpp Driver.h \
+  $(ACE_ROOT)/ace/pre.h \
+  notify_test_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Node.h \
   $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
@@ -5076,9 +5888,32 @@
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
   $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -5117,6 +5952,76 @@
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Notification_Strategy.h \
+  $(ACE_ROOT)/ace/Notification_Strategy.inl \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
@@ -5129,11 +6034,6 @@
   $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -5234,12 +6134,82 @@
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
+  Driver_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  $(ACE_ROOT)/ace/Argv_Type_Converter.h \
+  $(ACE_ROOT)/ace/Argv_Type_Converter.inl \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/PICurrent.h \
+  $(TAO_ROOT)/tao/PICurrent.inl \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i \
+  LookupManager.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  Command_Builder.h Name.h Activation_Manager.h Task_Callback.h \
+  Periodic_Supplier.h Notify_StructuredPushSupplier.h \
+  StructuredPushSupplier.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
@@ -5259,83 +6229,76 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
-  notify_test_export.h
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Supplier_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
+  Options_Parser.h Supplier_T.inl Supplier_T.cpp \
+  StructuredPushSupplier.inl Task_Stats.h Task_Stats.inl \
+  $(ACE_ROOT)/ace/High_Res_Timer.h \
+  $(ACE_ROOT)/ace/High_Res_Timer.i \
+  StructuredEvent.h Periodic_Consumer.h Notify_StructuredPushConsumer.h \
+  StructuredPushConsumer.h Consumer_T.h Consumer_T.inl Consumer_T.cpp \
+  StructuredPushConsumer.inl Activation_ManagerS.h Activation_ManagerC.h \
+  Activation_ManagerC.i Activation_ManagerS.i
 
-.obj/Notify_StructuredPushConsumer.o .obj/Notify_StructuredPushConsumer.so .shobj/Notify_StructuredPushConsumer.o .shobj/Notify_StructuredPushConsumer.so: Notify_StructuredPushConsumer.cpp \
-  Notify_StructuredPushConsumer.h \
+.obj/EventChannel_Command.o .obj/EventChannel_Command.so .shobj/EventChannel_Command.o .shobj/EventChannel_Command.so: EventChannel_Command.cpp EventChannel_Command.h \
   $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
-  $(TAO_ROOT)/tao/corba.h \
+  notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -5347,15 +6310,13 @@
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
@@ -5367,26 +6328,6 @@
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -5405,11 +6346,37 @@
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -5543,11 +6510,55 @@
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
+  Command.h \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  ../../../orbsvcs/Notify/CosNotify_Initializer.h \
+  ../../../orbsvcs/Notify/notify_export.h LookupManager.h \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  Name.h Options_Parser.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  ../../../orbsvcs/Notify/Service.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
@@ -5567,83 +6578,78 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
-  notify_test_export.h
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i
 
-.obj/Notify_StructuredPushSupplier.o .obj/Notify_StructuredPushSupplier.so .shobj/Notify_StructuredPushSupplier.o .shobj/Notify_StructuredPushSupplier.so: Notify_StructuredPushSupplier.cpp \
-  Notify_StructuredPushSupplier.h \
+.obj/Factories_Define.o .obj/Factories_Define.so .shobj/Factories_Define.o .shobj/Factories_Define.so: Factories_Define.cpp Factories_Define.h \
   $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
-  $(TAO_ROOT)/tao/corba.h \
+  Command_Factory_T.h notify_test_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -5655,15 +6661,9 @@
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
@@ -5675,26 +6675,277 @@
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(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/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(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/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  Command_Factory.h Command_Factory_T.cpp \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  Command_Builder.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i Name.h \
+  EventChannel_Command.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
+  Command.h \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  ../../../orbsvcs/Notify/CosNotify_Initializer.h \
+  ../../../orbsvcs/Notify/notify_export.h Application_Command.h \
+  SupplierAdmin_Command.h ConsumerAdmin_Command.h \
+  Periodic_Supplier_Command.h Periodic_Consumer_Command.h \
+  Filter_Command.h
+
+.obj/Filter_Command.o .obj/Filter_Command.so .shobj/Filter_Command.o .shobj/Filter_Command.so: Filter_Command.cpp Filter_Command.h \
+  $(ACE_ROOT)/ace/pre.h \
+  notify_test_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
   $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
   $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Malloc.i \
   $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
   $(ACE_ROOT)/ace/Free_List.h \
@@ -5713,11 +6964,37 @@
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.i \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
   $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -5851,63 +7128,331 @@
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
+  Command.h \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  LookupManager.h \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
-  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
-  $(ACE_ROOT)/ace/Atomic_Op.i \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
-  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  Name.h
+
+.obj/LookupManager.o .obj/LookupManager.so .shobj/LookupManager.o .shobj/LookupManager.so: LookupManager.cpp LookupManager.h \
+  $(ACE_ROOT)/ace/pre.h \
+  notify_test_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(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/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
-  notify_test_export.h
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  Name.h
+
+.obj/Name.o .obj/Name.so .shobj/Name.o .shobj/Name.so: Name.cpp Name.h \
+  $(ACE_ROOT)/ace/pre.h \
+  notify_test_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl
 
 .obj/Notify_Test_Client.o .obj/Notify_Test_Client.so .shobj/Notify_Test_Client.o .shobj/Notify_Test_Client.so: Notify_Test_Client.cpp Notify_Test_Client.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
@@ -6183,7 +7728,6 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
@@ -6474,7 +8018,6 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
@@ -6737,7 +8280,6 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
@@ -6768,7 +8310,10 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  Name.h Periodic_Consumer.h Notify_StructuredPushConsumer.h \
+  Name.h Periodic_Consumer.h Task_Stats.h Task_Stats.inl \
+  $(ACE_ROOT)/ace/High_Res_Timer.h \
+  $(ACE_ROOT)/ace/High_Res_Timer.i \
+  Notify_StructuredPushConsumer.h StructuredPushConsumer.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
@@ -6811,8 +8356,12 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
-  Task_Stats.h Task_Stats.inl Activation_Manager.h Task_Callback.h \
-  Periodic_Supplier.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Consumer_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
+  Options_Parser.h Consumer_T.inl Consumer_T.cpp \
+  StructuredPushConsumer.inl Relay_Consumer.h Direct_Consumer.h \
+  Activation_Manager.h Task_Callback.h Periodic_Supplier.h \
   $(ACE_ROOT)/ace/Task.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
@@ -6849,11 +8398,10 @@
   $(ACE_ROOT)/ace/Module.cpp \
   $(ACE_ROOT)/ace/Stream_Modules.h \
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  Notify_StructuredPushSupplier.h StructuredEvent.h Activation_ManagerS.h \
-  Activation_ManagerC.h Activation_ManagerC.i Activation_ManagerS.i \
-  Options_Parser.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i
+  Notify_StructuredPushSupplier.h StructuredPushSupplier.h Supplier_T.h \
+  Supplier_T.inl Supplier_T.cpp StructuredPushSupplier.inl \
+  StructuredEvent.h Activation_ManagerS.h Activation_ManagerC.h \
+  Activation_ManagerC.i Activation_ManagerS.i
 
 .obj/Periodic_Supplier_Command.o .obj/Periodic_Supplier_Command.so .shobj/Periodic_Supplier_Command.o .shobj/Periodic_Supplier_Command.so: Periodic_Supplier_Command.cpp \
   Periodic_Supplier_Command.h \
@@ -7109,7 +8657,6 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
@@ -7177,7 +8724,7 @@
   $(ACE_ROOT)/ace/Module.cpp \
   $(ACE_ROOT)/ace/Stream_Modules.h \
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  Notify_StructuredPushSupplier.h \
+  Notify_StructuredPushSupplier.h StructuredPushSupplier.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
@@ -7220,12 +8767,19 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
-  Task_Stats.h Task_Stats.inl StructuredEvent.h Activation_Manager.h \
-  Task_Callback.h Periodic_Consumer.h Notify_StructuredPushConsumer.h \
-  Activation_ManagerS.h Activation_ManagerC.h Activation_ManagerC.i \
-  Activation_ManagerS.i Options_Parser.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Supplier_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
+  Options_Parser.h Supplier_T.inl Supplier_T.cpp \
+  StructuredPushSupplier.inl Task_Stats.h Task_Stats.inl \
+  $(ACE_ROOT)/ace/High_Res_Timer.h \
+  $(ACE_ROOT)/ace/High_Res_Timer.i \
+  StructuredEvent.h Direct_Supplier.h Direct_Supplier.inl \
+  Activation_Manager.h Task_Callback.h Periodic_Consumer.h \
+  Notify_StructuredPushConsumer.h StructuredPushConsumer.h Consumer_T.h \
+  Consumer_T.inl Consumer_T.cpp StructuredPushConsumer.inl \
+  Activation_ManagerS.h Activation_ManagerC.h Activation_ManagerC.i \
+  Activation_ManagerS.i
 
 .obj/Periodic_Consumer.o .obj/Periodic_Consumer.so .shobj/Periodic_Consumer.o .shobj/Periodic_Consumer.so: Periodic_Consumer.cpp Periodic_Consumer.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -7233,44 +8787,55 @@
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  Notify_StructuredPushConsumer.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
-  $(TAO_ROOT)/tao/corba.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
+  Task_Stats.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -7282,26 +8847,32 @@
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  Task_Stats.inl \
+  $(ACE_ROOT)/ace/High_Res_Timer.h \
+  $(ACE_ROOT)/ace/High_Res_Timer.i \
+  Notify_StructuredPushConsumer.h StructuredPushConsumer.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
@@ -7417,7 +8988,6 @@
   $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
@@ -7503,7 +9073,6 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
@@ -7534,24 +9103,17 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
-  Task_Stats.h \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(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 \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  Task_Stats.inl \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Consumer_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
   $(ACE_ROOT)/ace/Arg_Shifter.h \
-  $(ACE_ROOT)/ace/High_Res_Timer.h \
-  $(ACE_ROOT)/ace/High_Res_Timer.i \
+  Name.h LookupManager.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  Options_Parser.h Consumer_T.inl Consumer_T.cpp \
+  StructuredPushConsumer.inl \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
@@ -7559,12 +9121,7 @@
   $(TAO_ROOT)/tao/TimeBaseC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
-  StructuredEvent.h Task_Callback.h LookupManager.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  Priority_Mapping.h
+  StructuredEvent.h Task_Callback.h Priority_Mapping.h
 
 .obj/Periodic_Supplier.o .obj/Periodic_Supplier.so .shobj/Periodic_Supplier.o .shobj/Periodic_Supplier.so: Periodic_Supplier.cpp Periodic_Supplier.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -7691,7 +9248,7 @@
   $(ACE_ROOT)/ace/Module.cpp \
   $(ACE_ROOT)/ace/Stream_Modules.h \
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  Notify_StructuredPushSupplier.h \
+  Notify_StructuredPushSupplier.h StructuredPushSupplier.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
@@ -7891,7 +9448,6 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
@@ -7922,10 +9478,20 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
-  Task_Stats.h Task_Stats.inl StructuredEvent.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \
+  Supplier_T.h Peer_T.h Peer.h Peer.inl Peer_T.inl Peer_T.cpp \
   $(ACE_ROOT)/ace/Arg_Shifter.h \
+  Name.h LookupManager.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  Options_Parser.h Supplier_T.inl Supplier_T.cpp \
+  StructuredPushSupplier.inl Task_Stats.h Task_Stats.inl \
   $(ACE_ROOT)/ace/High_Res_Timer.h \
   $(ACE_ROOT)/ace/High_Res_Timer.i \
+  StructuredEvent.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
@@ -7956,6 +9522,10 @@
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -7968,12 +9538,7 @@
   $(TAO_ROOT)/tao/TimeBaseC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
-  Task_Callback.h LookupManager.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  Priority_Mapping.h
+  Task_Callback.h Priority_Mapping.h
 
 .obj/Priority_Mapping.o .obj/Priority_Mapping.so .shobj/Priority_Mapping.o .shobj/Priority_Mapping.so: Priority_Mapping.cpp Priority_Mapping.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -8726,7 +10291,6 @@
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
@@ -8830,6 +10394,8 @@
   $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
-  notify_test_export.h Task_Stats.inl
+  notify_test_export.h Task_Stats.inl \
+  $(ACE_ROOT)/ace/High_Res_Timer.h \
+  $(ACE_ROOT)/ace/High_Res_Timer.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
index cb24d60d4b8..fb71d3b9bda 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
@@ -178,9 +178,12 @@ TAO_NS_Activation_Manager::activate_suppliers (void)
 void
 TAO_NS_Activation_Manager::dump_stats (void)
 {
+  char hostname[MAXHOSTNAMELEN];
+  ACE_OS::hostname (hostname, MAXHOSTNAMELEN);
+
   /// dump suppliers:
   char msg[BUFSIZ];
-  ACE_OS::sprintf (msg, "# Stats generated on --\n");
+  ACE_OS::sprintf (msg, "# Stats generated on %s\n", hostname);
 
   TAO_NS_PeriodicSupplier_Iterator sup_iter(this->supplier_map_);
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
new file mode 100644
index 00000000000..d679ac29978
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -0,0 +1,111 @@
+// $Id$
+#ifndef TAO_NS_Consumer_T_CPP
+#define TAO_NS_Consumer_T_CPP
+
+#include "Consumer_T.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "Consumer_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(Notify, TAO_NS_Consumer_T, "$id$")
+
+template <class Consumer_Traits>
+TAO_NS_Consumer_T<Consumer_Traits>::TAO_NS_Consumer_T (void)
+{
+}
+
+template <class Consumer_Traits>
+TAO_NS_Consumer_T<Consumer_Traits>::~TAO_NS_Consumer_T ()
+{
+}
+
+template <class Consumer_Traits> TAO_NS_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
+TAO_NS_Consumer_T<Consumer_Traits>::get_proxy_supplier (void)
+{
+  return this->get_proxy ();
+}
+
+template <class Consumer_Traits> TAO_NS_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
+TAO_NS_Consumer_T<Consumer_Traits>::obtain_proxy (TAO_NS_Consumer_T<Consumer_Traits>::Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL)
+{
+  Consumer_Traits traits;
+
+  CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier =
+    admin_ptr->obtain_notification_push_supplier (traits.type_
+                                                  , this->proxy_id_
+                                                  ACE_ENV_ARG_PARAMETER
+                                                  );
+
+  ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ());
+
+  ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ()));
+
+  return Proxy_Traits_INTERFACE::_narrow (proxy_supplier.in ()
+  ACE_ENV_ARG_PARAMETER);
+}
+
+template <class Consumer_Traits> TAO_NS_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
+TAO_NS_Consumer_T<Consumer_Traits>::obtain_proxy (TAO_NS_Consumer_T<Consumer_Traits>::Admin_Ext_Traits_PTR admin_ptr
+                                             , CosNotification::QoSProperties& qos
+                                             ACE_ENV_ARG_DECL)
+{
+  Consumer_Traits traits;
+
+  // create the proxy consumer
+  CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier =
+    admin_ptr->obtain_notification_push_supplier_with_qos (traits.type_
+                                                           , this->proxy_id_
+                                                           , qos
+                                                           ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ());
+
+  ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ()));
+
+  return Proxy_Traits_INTERFACE::_narrow (proxy_supplier.in ()
+                                           ACE_ENV_ARG_PARAMETER);
+}
+
+template <class Consumer_Traits> void
+TAO_NS_Consumer_T<Consumer_Traits>::subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL)
+{
+  // Let the user see what we're subscribed for,
+  ACE_DEBUG ((LM_DEBUG, "Calling Consumer subscription change: "));
+
+  CORBA::ULong i = 0;
+
+  for (; i < added.length (); ++i)
+    {
+      ACE_DEBUG ((LM_DEBUG, "+(%s,%s), ", added[i].domain_name.in (), added[i].type_name.in ()));
+    }
+  for (i = 0; i < removed.length (); ++i)
+    {
+      ACE_DEBUG ((LM_DEBUG, "-(%s,%s), ", removed[i].domain_name.in (), removed[i].type_name.in ()));
+    }
+
+  ACE_DEBUG ((LM_DEBUG, "\n"));
+
+  /// subscribe
+  ACE_TYPENAME Proxy_Traits::PTR proxy_supplier = this->get_proxy ();
+
+  if (proxy_supplier != 0)
+    {
+      proxy_supplier->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    ACE_DEBUG ((LM_DEBUG, "Proxy Supplier not available, subscription change not made."));
+}
+
+template <class Consumer_Traits> void
+TAO_NS_Consumer_T<Consumer_Traits>::offer_change
+   (const CosNotification::EventTypeSeq & /*added*/,
+    const CosNotification::EventTypeSeq & /*removed*/
+    ACE_ENV_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNotifyComm::InvalidEventType))
+{
+  // No-Op.
+}
+
+#endif /* TAO_NS_Consumer_T_CPP */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
new file mode 100644
index 00000000000..fd4a328fc98
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
@@ -0,0 +1,104 @@
+/* -*- C++ -*- */
+/**
+ *  @file Consumer_T.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_CONSUMER_T_H
+#define TAO_NS_CONSUMER_T_H
+#include "ace/pre.h"
+
+#include "notify_test_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Peer_T.h"
+
+class TAO_NS_ConsumerAdmin_Traits
+{
+ public:
+  typedef CosNotifyChannelAdmin::ConsumerAdmin INTERFACE;
+  typedef CosNotifyChannelAdmin::ConsumerAdmin_ptr PTR;
+  typedef CosNotifyChannelAdmin::ConsumerAdmin_var VAR;
+};
+
+class TAO_NS_ConsumerAdmin_Ext_Traits
+{
+ public:
+  typedef NotifyExt::ConsumerAdmin INTERFACE;
+  typedef NotifyExt::ConsumerAdmin_ptr PTR;
+  typedef NotifyExt::ConsumerAdmin_var VAR;
+};
+
+/**
+ * @class TAO_NS_Consumer_T
+ *
+ * @brief
+ *
+ */
+template <class Consumer_Traits>
+class TAO_NOTIFY_TEST_Export TAO_NS_Consumer_T : public TAO_NS_Peer_T <Consumer_Traits>
+{
+  typedef ACE_TYPENAME Consumer_Traits::Admin_Traits Admin_Traits;
+  typedef ACE_TYPENAME Consumer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
+  typedef ACE_TYPENAME Consumer_Traits::Proxy_Traits Proxy_Traits;
+
+  typedef ACE_TYPENAME Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE;
+  typedef ACE_TYPENAME Proxy_Traits::PTR Proxy_Traits_PTR;
+  typedef ACE_TYPENAME Admin_Traits::PTR Admin_Traits_PTR;
+  typedef ACE_TYPENAME Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR;
+
+public:
+  /// Constuctor
+  TAO_NS_Consumer_T (void);
+
+  /// Destructor
+  ~TAO_NS_Consumer_T ();
+
+  /// For backward compatibility. use <get_proxy> instead.
+  Proxy_Traits_PTR get_proxy_supplier (void);
+
+  /// Send subscription_change
+  virtual void subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL);
+
+protected:
+  /// Obtain Proxy.
+  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL);
+
+  /// Obtain Proxy with QoS.
+  virtual Proxy_Traits_PTR obtain_proxy (Admin_Ext_Traits_PTR admin_ptr
+                                         , CosNotification::QoSProperties& qos
+                                          ACE_ENV_ARG_DECL);
+
+  // = NotifyPublish method
+  virtual void offer_change (const CosNotification::EventTypeSeq & added,
+        const CosNotification::EventTypeSeq & removed
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        CosNotifyComm::InvalidEventType
+      ));
+};
+
+#if defined (__ACE_INLINE__)
+#include "Consumer_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Consumer_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Consumer_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+#endif /* TAO_NS_CONSUMER_T_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.inl b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.inl
new file mode 100644
index 00000000000..74e88caa0c5
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.inl
@@ -0,0 +1,2 @@
+// $Id$
+
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
new file mode 100644
index 00000000000..90e7d3022bc
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
@@ -0,0 +1,41 @@
+// $Id$
+
+#include "Direct_Consumer.h"
+
+ACE_RCSID(lib, TAO_Direct_Consumer, "$id$")
+
+#include "LookupManager.h"
+
+TAO_NS_Direct_Consumer::TAO_NS_Direct_Consumer (void)
+{
+}
+
+TAO_NS_Direct_Consumer::~TAO_NS_Direct_Consumer ()
+{
+}
+
+void
+TAO_NS_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+{
+  ACE_DEBUG ((LM_DEBUG, "TAO_NS_Direct_Consumer::connect resolving poa %s\n",
+              this->poa_name_.c_str ()));
+  // Get the POA
+  PortableServer::POA_var poa;
+  LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // set the POA
+  this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  ACE_DEBUG ((LM_DEBUG, "TAO_NS_Direct_Consumer::connect - _this\n"));
+
+  // Activate the consumer with the default_POA_.
+  CosNotifyComm::StructuredPushConsumer_var consumer_ref =
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Register the activated object.
+  LOOKUP_MANAGER->_register (consumer_ref.in (), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
new file mode 100644
index 00000000000..38e486dea6d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
@@ -0,0 +1,44 @@
+/* -*- C++ -*- */
+/**
+ *  @file Direct_Consumer.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_DIRECT_CONSUMER_H
+#define TAO_NS_DIRECT_CONSUMER_H
+#include "ace/pre.h"
+
+#include "notify_test_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Periodic_Consumer.h"
+
+/**
+ * @class TAO_NS_Direct_Consumer
+ *
+ * @brief Does not connect to the Notification Service. The Direct Supplier supplies events directly.
+ *
+ */
+class TAO_NOTIFY_TEST_Export TAO_NS_Direct_Consumer : public TAO_NS_Periodic_Consumer
+{
+public:
+  /// Constuctor
+  TAO_NS_Direct_Consumer (void);
+
+  /// Destructor
+  ~TAO_NS_Direct_Consumer ();
+
+  /// Connect using options parsed and set initial QoS.
+  virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
+};
+
+#include "ace/post.h"
+#endif /* TAO_NS_DIRECT_CONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
new file mode 100644
index 00000000000..af7cf9fa69a
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
@@ -0,0 +1,56 @@
+// $Id$
+
+#include "Direct_Supplier.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "Direct_Supplier.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(Notify, TAO_NS_Direct_Supplier, "$id$")
+
+#include "LookupManager.h"
+
+TAO_NS_Direct_Supplier::TAO_NS_Direct_Supplier (ACE_CString& target)
+  : target_ (target)
+{
+}
+
+TAO_NS_Direct_Supplier::~TAO_NS_Direct_Supplier ()
+{
+}
+
+void
+TAO_NS_Direct_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+{
+  // Get the POA
+  PortableServer::POA_var poa;
+  LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // set the POA
+  this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Get hold of the reference.
+  CosNotifyComm::StructuredPushSupplier_var supplier_ref =
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Register the activated object.
+  LOOKUP_MANAGER->_register (supplier_ref.in (), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Resolve the target object.
+  LOOKUP_MANAGER->resolve (this->target_object_, this->target_.c_str () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_NS_Direct_Supplier::send_event (const CosNotification::StructuredEvent& event
+                                   ACE_ENV_ARG_DECL)
+{
+  ACE_ASSERT (!CORBA::is_nil (this->target_object_.in ()));
+
+  this->target_object_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
new file mode 100644
index 00000000000..cf913471ff1
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
@@ -0,0 +1,59 @@
+/* -*- C++ -*- */
+/**
+ *  @file Direct_Supplier.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_DIRECT_SUPPLIER_H
+#define TAO_NS_DIRECT_SUPPLIER_H
+#include "ace/pre.h"
+
+#include "notify_test_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Periodic_Supplier.h"
+
+/**
+ * @class TAO_NS_Direct_Supplier
+ *
+ * @brief Send Directly to a consumer.
+ *
+ */
+class TAO_NOTIFY_TEST_Export TAO_NS_Direct_Supplier : public TAO_NS_Periodic_Supplier
+{
+public:
+  /// Constuctor
+  TAO_NS_Direct_Supplier (ACE_CString& target);
+
+  /// Destructor
+  ~TAO_NS_Direct_Supplier ();
+
+  /// Connect using options parsed and set initial QoS.
+  virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
+
+  // Send one event. Bypass sending to the Notify and send directly to taget consumer.
+  virtual void send_event (const CosNotification::StructuredEvent& event
+                           ACE_ENV_ARG_DECL);
+
+protected:
+  /// Target object.
+  ACE_CString target_;
+
+  /// This object is resolved in the connect method.
+  CosNotifyComm::StructuredPushConsumer_var target_object_;
+};
+
+#if defined (__ACE_INLINE__)
+#include "Direct_Supplier.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /* TAO_NS_DIRECT_SUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.inl b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.inl
new file mode 100644
index 00000000000..94e7f9bf7fa
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.inl
@@ -0,0 +1,3 @@
+// $Id$
+
+#include "Direct_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index e08050d5c65..0cbf2e470e2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -30,12 +30,23 @@ TAO_NS_Worker::command_builder (TAO_NS_Command_Builder* cmd_builder)
 int
 TAO_NS_Worker::svc (void)
 {
-  ACE_DEBUG ((LM_DEBUG, "Running Commands... \n"));
+  ACE_hthread_t current;
+  ACE_Thread::self (current);
+
+  int priority;
+  if (ACE_Thread::getprio (current, priority) == -1)
+    {
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Failed to get Worker thread priority\n")));
+      return -1;
+    }
+
+  ACE_DEBUG ((LM_ERROR, "Activated Worker Thread for commands @ priority:%d \n", priority));
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
+      ACE_DEBUG ((LM_DEBUG, "Running Commands... \n"));
       this->cmd_builder_->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
@@ -53,6 +64,56 @@ TAO_NS_Worker::svc (void)
 
 /*****************************************************************/
 
+TAO_NS_ORB_Run_Worker::TAO_NS_ORB_Run_Worker (void)
+{
+}
+
+void
+TAO_NS_ORB_Run_Worker::orb (CORBA::ORB_ptr orb)
+{
+  orb_ = CORBA::ORB::_duplicate (orb);
+}
+
+void
+TAO_NS_ORB_Run_Worker::run_period (ACE_Time_Value run_period)
+{
+  this->run_period_ = run_period;
+}
+
+int
+TAO_NS_ORB_Run_Worker::svc (void)
+{
+  ACE_hthread_t current;
+  ACE_Thread::self (current);
+
+  int priority;
+  if (ACE_Thread::getprio (current, priority) == -1)
+    {
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Failed to get Worker thread priority\n")));
+      return -1;
+    }
+
+
+  ACE_DEBUG ((LM_ERROR, "Activated ORB Run Worker Thread to run the ORB @ priority:%d \n", priority));
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      ACE_DEBUG ((LM_ERROR, "Running ORB, timeout in %d sec\n", this->run_period_.sec ()));
+
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  return 0;
+}
+
+/*****************************************************************/
+
 TAO_NS_Driver::TAO_NS_Driver (void)
   :cmd_builder_ (0), activation_manager_ (0), run_period_ (0,0)
 {
@@ -134,45 +195,50 @@ TAO_NS_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
 
   worker_.command_builder (this->cmd_builder_);
 
+  // Set the run period.
+  if (this->run_period_ != ACE_Time_Value::zero)
+    this->orb_run_worker_.run_period (this->run_period_);
+
+  // Set the ORB
+  this->orb_run_worker_.orb (this->orb_.in ());
+
   return 0;
 }
 
 void
 TAO_NS_Driver::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
-  long flags = THR_NEW_LWP | THR_JOINABLE;
-
-  flags |=
-    this->orb_->orb_core ()->orb_params ()->sched_policy () |
-    this->orb_->orb_core ()->orb_params ()->scope_policy ();
+  // Task activation flags.
+  long flags =
+    THR_NEW_LWP |
+    THR_JOINABLE |
+    this->orb_->orb_core ()->orb_params ()->thread_creation_flags ();
 
-  ACE_Sched_Params::Policy sched_policy;
+  // Become an active object.
+  if (this->worker_.activate (flags) == -1)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("Insufficient privilege to activate ACE_Task.\n")));
+      else
+        ACE_DEBUG ((LM_ERROR,
+                    ACE_TEXT ("(%t) Task activation at priority %d failed, ")
+                    ACE_TEXT ("exiting!\n%a"),
+                    ACE_DEFAULT_THREAD_PRIORITY,
+                    -1));
+    }
 
-  long thr_sched_policy = this->orb_->orb_core ()->orb_params ()->sched_policy ();
 
-  //long thr_scope_policy = this->orb_->orb_core ()->orb_params ()->scope_policy ();
+  this->orb_->run (0);
 
-  if (thr_sched_policy == THR_SCHED_FIFO)
-    {
-      sched_policy = ACE_SCHED_FIFO;
-    }
-  else if (thr_sched_policy == THR_SCHED_RR)
-    {
-      sched_policy = ACE_SCHED_RR;
-    }
-  else
-    {
-      sched_policy = ACE_SCHED_OTHER;
-    }
+  ACE_DEBUG ((LM_ERROR, "Waiting for worker thread to end\n"));
 
-  /// Check sched.
-  int min_priority = ACE_Sched_Params::priority_min (sched_policy);
+  // Wait till we're done.
+  this->worker_.thr_mgr ()->wait ();
+  return;
 
-  // Become an active object.
-  if (this->worker_.activate (flags,
-                              1,
-                              0,
-                              min_priority) == -1) //ACE_DEFAULT_THREAD_PRIORITY) == -1)
+  // Activate the ORB run worker.
+  if (this->orb_run_worker_.activate (flags) == -1)
     {
       if (ACE_OS::last_error () == EPERM)
         ACE_ERROR ((LM_ERROR,
@@ -185,14 +251,8 @@ TAO_NS_Driver::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                     -1));
     }
 
-  ACE_DEBUG ((LM_ERROR, "Activated Worker Thread for commands at priority %d\n", min_priority));
-
-  ACE_DEBUG ((LM_ERROR, "Running ORB, timeout in %d sec\n", this->run_period_.sec ()));
-
-  if (this->run_period_ == ACE_Time_Value::zero)
-    this->orb_->run (0);
-  else
-    this->orb_->run (this->run_period_);
+  // Wait till we're done.
+  this->orb_run_worker_.thr_mgr ()->wait ();
 }
 
 void
@@ -201,6 +261,7 @@ TAO_NS_Driver::shutdown (void)
   this->orb_->shutdown ();
 }
 
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Dynamic_Service<TAO_NS_Command_Builder>;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h
index b072303d173..fe8dbc67a5a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h
@@ -58,6 +58,37 @@ private:
   TAO_NS_Command_Builder* cmd_builder_;
 };
 
+
+
+class TAO_NS_ORB_Run_Worker : public ACE_Task_Base
+{
+  // = TITLE
+  //   Run a server thread
+  //
+  // = DESCRIPTION
+  //   Use the ACE_Task_Base class to run server threads
+  //
+public:
+  TAO_NS_ORB_Run_Worker (void);
+  // ctor
+
+  void orb (CORBA::ORB_ptr orb);
+
+  /// Srt the run period.
+  void run_period (ACE_Time_Value run_period);
+
+  virtual int svc (void);
+  // The thread entry point.
+
+private:
+  /// The orb
+  CORBA::ORB_var orb_;
+
+  /// ORB Run Period.
+  ACE_Time_Value run_period_;
+};
+
+
 /**
  * @class TAO_NS_Driver
  *
@@ -95,6 +126,9 @@ protected:
   /// Thread in which to run commands.
   TAO_NS_Worker worker_;
 
+  /// Thread in which to run the orb.
+  TAO_NS_ORB_Run_Worker orb_run_worker_;
+
   /// The ORB we run.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index c5060d38b42..cc20c12f645 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -8,8 +8,11 @@ ACE_RCSID(lib, TAO_EventChannel_Command, "$id$")
 #include "LookupManager.h"
 #include "Name.h"
 #include "Options_Parser.h"
+#include "ace/Dynamic_Service.h"
+#include "../../../orbsvcs/Notify/Service.h"
 
 TAO_NS_EventChannel_Command::TAO_NS_EventChannel_Command (void)
+  : colocated_ (0)
 {
 }
 
@@ -34,7 +37,7 @@ TAO_NS_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
-      if (arg_shifter.cur_arg_strncasecmp ("-Create") == 0) // -Create ec_name factory_name
+      if (arg_shifter.cur_arg_strncasecmp ("-Create") == 0) // -Create ec_name factory_name [COLOCATED]
         {
           this->command_ = CREATE;
 
@@ -45,6 +48,11 @@ TAO_NS_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
 
           this->factory_ = arg_shifter.get_current ();
           arg_shifter.consume_arg ();
+
+          if (arg_shifter.cur_arg_strncasecmp ("COLOCATED") == 0)
+            {
+              this->colocated_ = 1;
+            }
         }
       else if (arg_shifter.cur_arg_strncasecmp ("-Destroy") == 0) // -Destroy ec_name
         {
@@ -73,8 +81,67 @@ TAO_NS_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
+TAO_NS_EventChannel_Command::create_colocated_ecf (ACE_ENV_SINGLE_ARG_DECL)
+{
+  CosNotifyChannelAdmin::EventChannelFactory_var notify_factory;
+
+  // The Service Object.
+  TAO_Notify_Service* notify_service;
+
+  notify_service = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NS_NOTIFICATION_SERVICE_NAME);
+
+  if (notify_service == 0)
+    {
+      notify_service = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NOTIFY_DEF_EMO_FACTORY_NAME);
+    }
+
+  if (notify_service == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG, "Service not found! check conf. file\n"));
+      return;
+    }
+
+  // Resolve some helpers.
+  CORBA::ORB_var orb;
+  PortableServer::POA_var poa;
+  CosNaming::NamingContextExt_var naming;
+
+  LOOKUP_MANAGER->resolve (orb);
+
+  LOOKUP_MANAGER->resolve (poa);
+
+  LOOKUP_MANAGER->resolve (naming);
+
+  notify_service->init (orb.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Activate the factory
+  notify_factory =
+    notify_service->create (poa.in ()
+                            ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Register with the Naming Service
+  CosNaming::Name_var name =
+    naming->to_name (TAO_NS_Name::event_channel_factory
+                     ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  naming->rebind (name.in (),
+                  notify_factory.in ()
+                  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
 TAO_NS_EventChannel_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 {
+  if (this->colocated_ == 1)
+    {
+      this->create_colocated_ecf (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
   CosNotifyChannelAdmin::EventChannelFactory_var ec_factory;
 
   LOOKUP_MANAGER->resolve (ec_factory , TAO_NS_Name::event_channel_factory ACE_ENV_ARG_PARAMETER);
@@ -83,7 +150,7 @@ TAO_NS_EventChannel_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
   CosNotification::QoSProperties qos;
   CosNotification::AdminProperties admin;
 
-  // create an event channel
+  // Create an event channel
   CosNotifyChannelAdmin::EventChannel_var ec =
     ec_factory->create_channel (qos,
                                 admin,
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index 7a9472a3ec1..3f2c7720121 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -22,6 +22,9 @@
 #include "ace/SString.h"
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
+#include "../../../orbsvcs/Notify/CosNotify_Initializer.h"
+
+class TAO_Notify_Service;
 
 /**
  * @class TAO_NS_EventChannel_Command
@@ -73,6 +76,12 @@ protected:
 
   CosNotification::AdminProperties admin_;
 
+  /// Flag to tell if the Channel Factory should be colocated.
+  CORBA::Boolean colocated_;
+
+  /// Helper method to create a colocated ECF.
+  void create_colocated_ecf (ACE_ENV_SINGLE_ARG_DECL);
+
   /// = Handlers
   void handle_create (ACE_ENV_SINGLE_ARG_DECL);
   void handle_destroy (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
index ed7e71d93b8..b00d532ad54 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -201,22 +201,22 @@ TAO_NS_LookupManager::resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , co
 }
 
 void
-TAO_NS_LookupManager::resolve (CosNotifyChannelAdmin::StructuredProxyPushSupplier_var& proxy, const char * proxy_name ACE_ENV_ARG_DECL)
+TAO_NS_LookupManager::resolve (CosNotifyComm::StructuredPushSupplier_var& supplier, const char *supplier_name ACE_ENV_ARG_DECL)
 {
-  CORBA::Object_var object = this->resolve_object (proxy_name ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = this->resolve_object (supplier_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  proxy = CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
+  supplier = CosNotifyComm::StructuredPushSupplier::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_NS_LookupManager::resolve (CosNotifyChannelAdmin::StructuredProxyPushConsumer_var& proxy, const char * proxy_name ACE_ENV_ARG_DECL)
+TAO_NS_LookupManager::resolve (CosNotifyComm::StructuredPushConsumer_var& consumer, const char * consumer_name ACE_ENV_ARG_DECL)
 {
-  CORBA::Object_var object = this->resolve_object (proxy_name ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = this->resolve_object (consumer_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  proxy = CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
+  consumer = CosNotifyComm::StructuredPushConsumer::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
index d228a9212d6..a62fd7471b7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
@@ -81,8 +81,8 @@ public:
   void resolve (CosNotifyChannelAdmin::EventChannel_var& ec, const char *channel_name ACE_ENV_ARG_DECL);
   void resolve (CosNotifyChannelAdmin::SupplierAdmin_var& sa, const char *admin_name ACE_ENV_ARG_DECL);
   void resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , const char *admin_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyChannelAdmin::StructuredProxyPushSupplier_var& proxy, const char *proxy_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyChannelAdmin::StructuredProxyPushConsumer_var& proxy, const char *proxy_name ACE_ENV_ARG_DECL);
+  void resolve (CosNotifyComm::StructuredPushSupplier_var& supplier, const char *supplier_name ACE_ENV_ARG_DECL);
+  void resolve (CosNotifyComm::StructuredPushConsumer_var& consumer, const char *consumer_name ACE_ENV_ARG_DECL);
   void resolve (CosNotifyFilter::FilterFactory_var& ff, const char *filter_factory_name ACE_ENV_ARG_DECL);
   void resolve (CosNotifyFilter::Filter_var& filter, const char *filter_name ACE_ENV_ARG_DECL);
   void resolve (CosNotifyFilter::FilterAdmin_var& filter_admin, const char *filter_admin_name ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile b/TAO/orbsvcs/tests/Notify/lib/Makefile
index c580ee182d6..09e2332c277 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Makefile
+++ b/TAO/orbsvcs/tests/Notify/lib/Makefile
@@ -1,28 +1,49 @@
-#$Id$
 #----------------------------------------------------------------------------
-#       GNU Makefile
+#
+# $Id$
+#
 #----------------------------------------------------------------------------
-MAKEFILE        = Makefile
-DEPENDENCY_FILE = .depend.Makefile
-LIB_UNCHECKED   = libTAO_NotifyTests.a
-SHLIB_UNCHECKED = libTAO_NotifyTests.$(SOEXT)
-
-LSRC   = $(addsuffix .cpp, $(FILES))
-ACELIB = -lACE
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
-endif
+endif # ! TAO_ROOT
+
+MAKEFILE = Makefile
+DEPENDENCY_FILE = .depend.Makefile
+LIBNAME  = libTAO_NotifyTests
+LIB2      = $(LIBNAME).a
+SHLIB2    = $(LIBNAME).$(SOEXT)
+
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+
+ifeq (Notify,$(findstring Notify,$(TAO_ORBSVCS)))
+  LIB = $(LIB2)
+  SHLIB = $(SHLIB2)
+endif # Notify
 
 IDL_FILES = Activation_Manager
 IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext)))
 
+TAO_IDLFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -Ge 1 -Sc
 
+ACE_SHLIBS = -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO $(ACELIB)
 
-FILES = \
-  Activation_Manager \
+LDLIBS = -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO $(ACELIB)
+
+SRCS = \
   Activation_ManagerC \
   Activation_ManagerS \
+  Peer \
+  StructuredPushConsumer \
+  SequencePushConsumer \
+  PushConsumer \
+  StructuredPushSupplier \
+  SequencePushSupplier \
+  PushSupplier \
+  Direct_Consumer \
+  Direct_Supplier \
+  Relay_Consumer \
+  Activation_Manager \
   Application_Command \
   Command \
   Command_Builder \
@@ -35,12 +56,6 @@ FILES = \
   Filter_Command \
   LookupManager \
   Name \
-  Notify_PushConsumer \
-  Notify_PushSupplier \
-  Notify_SequencePushConsumer \
-  Notify_SequencePushSupplier \
-  Notify_StructuredPushConsumer \
-  Notify_StructuredPushSupplier \
   Notify_Test_Client \
   Options_Parser \
   Periodic_Consumer_Command \
@@ -52,48 +67,31 @@ FILES = \
   SupplierAdmin_Command \
   Task_Stats
 
+FILES = $(SRCS)
+DEFS  = $(addsuffix .h,$(FILES))
+LSRC  = $(addsuffix .cpp,$(FILES))
+
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-CURRENT_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Notify, $(findstring Notify, $(CURRENT_COMPONENTS)))
-ifeq (Naming, $(findstring Naming, $(CURRENT_COMPONENTS)))
-LIB   = $(LIB_UNCHECKED)
-SHLIB = $(SHLIB_UNCHECKED)
-endif
-endif
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-CPPFLAGS     += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(ACE_ROOT)
-ifeq ($(shared_libs),1)
-ifneq ($(SHLIB),)
-CPPFLAGS     += -DTAO_NOTIFY_TEST_BUILD_DLL
-endif
-endif
-ifeq ($(static_libs),1)
-ifneq ($(LIB),)
-CPPFLAGS     += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
-endif
-endif
-
-
-LDFLAGS      += -L$(TAO_ROOT)/tao/PortableServer -L$(TAO_ROOT)/tao/DynamicAny -L$(TAO_ROOT)/tao/IORTable -L$(TAO_ROOT)/orbsvcs/orbsvcs/ETCL -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
-TAO_IDLFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -Ge 1 -Sc
-
-ACE_SHLIBS = -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO $(ACELIB)
 
 #----------------------------------------------------------------------------
-#       Local targets
+#       Local targets (and local hacks)
 #----------------------------------------------------------------------------
 
+LDFLAGS  += -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
+
 ADDITIONAL_IDL_TARGETS =
 
 # IDL File Directory: .
@@ -106,3 +104,13 @@ all: idl_stubs
 
 realclean: clean
 	-$(RM) $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext)))
+
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.bor b/TAO/orbsvcs/tests/Notify/lib/Makefile.bor
index 927ecac025f..d43433ccda2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Makefile.bor
+++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.bor
@@ -7,6 +7,16 @@ NAME = TAO_NotifyTests
 TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
 
 OBJFILES = \
+	$(OBJDIR)\Direct_Consumer \
+	$(OBJDIR)\Direct_Supplier \
+	$(OBJDIR)\Relay_Consumer \
+	$(OBJDIR)\Peer \
+	$(OBJDIR)\StructuredPushConsumer \
+	$(OBJDIR)\SequencePushConsumer \
+	$(OBJDIR)\PushConsumer \
+	$(OBJDIR)\StructuredPushSupplier \
+	$(OBJDIR)\SequencePushSupplier \
+	$(OBJDIR)\PushSupplier \
 	$(OBJDIR)\Activation_ManagerC.obj \
 	$(OBJDIR)\Activation_ManagerS.obj \
 	$(OBJDIR)\Activation_Manager.obj \
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
index e1bed8335f0..54bd0446efc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
@@ -28,91 +28,9 @@
 #define TAO_NOTIFY_PUSHCONSUMER_H
 #include "ace/pre.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "notify_test_export.h"
+#include "PushConsumer.h"
 
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_NOTIFY_TEST_Export TAO_Notify_PushConsumer : public POA_CosNotifyComm::PushConsumer, public PortableServer::RefCountServantBase
-{
-  // = TITLE
-  //   TAO_Notify_PushConsumer
-  //
-  // = DESCRIPTION
-  //   Implements a common servant for the PushConsumer.
-  //
- public:
-    // = Initialization and Termination code
-  TAO_Notify_PushConsumer (void);
-  // Constructor.
-
-  void init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
-  // Init
-
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
-  // Activates this object with the <default_POA_>
-  // Creates a new proxy supplier and connects to it.
-
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
-  // Disconnect from the supplier.
-
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  // Deactivate the object from the POA.
-
-  // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-protected:
-  virtual ~TAO_Notify_PushConsumer ();
-  // Destructor
-
-  // = NotifyPublish method
-   void offer_change (
-        const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
-
-    void push (
-        const CORBA::Any & data
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-      ));
-  // The default operation is no op.
-
-    void disconnect_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // = Data members
-    PortableServer::POA_var default_POA_;
-    // The default POA.
-
-    CosNotifyChannelAdmin::ProxyID proxy_id_;
-    // The proxy's id.
-
-    CosNotifyChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
-    // The proxy that we are connected to.
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+typedef TAO_NS_PushConsumer TAO_Notify_PushConsumer;
 
 #include "ace/post.h"
 #endif /* TAO_NOTIFY_PUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
index 855cd9f8f54..4045e9a2eb6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
@@ -4,78 +4,9 @@
 #define TAO_NOTIFY_PUSHSUPPLIER_H
 #include "ace/pre.h"
 
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "notify_test_export.h"
+#include "PushSupplier.h"
 
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_NOTIFY_TEST_Export TAO_Notify_PushSupplier : public POA_CosNotifyComm::PushSupplier, public PortableServer::RefCountServantBase
-{
-public:
-    // = Initialization and Termination code
-  TAO_Notify_PushSupplier (void);
-  // Constructor.
-
-  void init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
-  // Init
-
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL);
-  // Activates this object with the <default_POA_>
-  // Creates a new proxy consumer and connects to it.
-
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
-  // Disconnect from the consumer proxy.
-
-  void send_event (const CORBA::Any & data ACE_ENV_ARG_DECL);
-  // Send the event to the channel.
-
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  // Deactivate the object.
-
-  // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-  CosNotifyChannelAdmin::ProxyID my_id_;
-  // This supplier's id.
-
- protected:
-  virtual ~TAO_Notify_PushSupplier ();
-  // Destructor
-
-  // = NotifySubscribe methods
-    void subscription_change (
-        const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
-
-    void disconnect_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // = Data members
-    PortableServer::POA_var default_POA_;
-    // The default POA.
-
-    CosNotifyChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
-    // The proxy that we are connected to.
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+typedef TAO_NS_PushSupplier TAO_Notify_PushSupplier;
 
 #include "ace/post.h"
 #endif /* TAO_NOTIFY_PUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
index a569229de0b..dd062a7724a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
@@ -21,95 +21,10 @@
 #define NOTIFY_SEQUENCEPUSHCONSUMER_H
 #include "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
-#include "notify_test_export.h"
+#include "SequencePushConsumer.h"
 
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_NOTIFY_TEST_Export TAO_Notify_SequencePushConsumer : public POA_CosNotifyComm::SequencePushConsumer, public PortableServer::RefCountServantBase
-{
-  // = TITLE
-  //   Notify_SequencePushConsumer
-  //
-  // = DESCRIPTION
-  //   Implements a common servant for the SequencePushConsumer.
-  //
- public:
-  // = Initialization and Termination code
-  TAO_Notify_SequencePushConsumer (void);
-  // Constructor.
-
-  void init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
-  // Saves the POA ref.
-
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
-  // Activates this servant with the POA supplied in init.
-  // Creates a new proxy supplier via the <consumer_admin> supplied and connects
-  // to it.
-
-  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
-  // Disconnect from the supplier.
-
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
-  // Deactivate the object from the default POA.
-
-  CosNotifyChannelAdmin::SequenceProxyPushSupplier_ptr get_proxy_supplier (void);
-  // Accessor for <proxy_supplier_>.
-
-  // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-protected:
-  // = Data Members
-  CosNotifyChannelAdmin::SequenceProxyPushSupplier_var proxy_supplier_;
-  // The proxy that we are connected to.
-
-  CosNotifyChannelAdmin::ProxyID proxy_supplier_id_;
-  // The <proxy_supplier_> id.
-
-  PortableServer::POA_var default_POA_;
-  // The default POA.
-
-  virtual ~TAO_Notify_SequencePushConsumer (void);
-  // Destructor
-
-  // = NotifyPublish method
-    virtual void offer_change (
-        const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
-
-  // = SequencePushConsumer methods
-  virtual void push_structured_events (
-        const CosNotification::EventBatch & notifications
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-       ));
-  // Default does nothing.
-
-  virtual void disconnect_sequence_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+typedef TAO_NS_SequencePushConsumer TAO_Notify_SequencePushConsumer;
 
 #include "ace/post.h"
+
 #endif /* NOTIFY_SEQUENCEPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
index dc93aad29df..c4811fb02ee 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
@@ -21,89 +21,9 @@
 #define TAO_NOTIFY_SEQUENCEPUSHSUPPLIER_H
 #include "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
-#include "notify_test_export.h"
+#include "SequencePushSupplier.h"
 
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_NOTIFY_TEST_Export TAO_Notify_SequencePushSupplier:public POA_CosNotifyComm::SequencePushSupplier, public PortableServer::RefCountServantBase
-{
-  // = TITLE
-  //   TAO_Notify_SequencePushSupplier
-  //
-  // = DESCRIPTION
-  //   Implements rudimentary SequencePushSupplier functionality.
-  //
- public:
-  // = Initialization and Termination code
-  TAO_Notify_SequencePushSupplier (void);
-  // Constructor.
-
-  void init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL);
-  // Init
-
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL);
-  // Activates this servant with the POA supplied in init.
-  // Creates a new proxy supplier and connects to it.
-
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
-  // Disconnect from the supplier.
-
-  virtual void send_events (const CosNotification::EventBatch & notifications
-                           ACE_ENV_ARG_DECL);
-  // Send one event.
-
-  CosNotifyChannelAdmin::SequenceProxyPushConsumer_ptr get_proxy_consumer (void);
-  // Accessor for <proxy_consumer_>.
-
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
-  // Deactivate the object.
-
-  // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-protected:
-  // = Data Members
-  CosNotifyChannelAdmin::SequenceProxyPushConsumer_var proxy_consumer_;
-  // The proxy that we are connected to.
-
-  CosNotifyChannelAdmin::ProxyID proxy_consumer_id_;
-  // This <proxy_consumer_> id.
-
-  PortableServer::POA_var default_POA_;
-  // The default POA.
-
-  virtual ~TAO_Notify_SequencePushSupplier ();
-  // Destructor
-
-  // = NotifySubscribe
-    virtual void subscription_change (
-        const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
-
-    // = SequencePushSupplier method
-    virtual void disconnect_sequence_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+typedef TAO_NS_SequencePushSupplier TAO_Notify_SequencePushSupplier;
 
 #include "ace/post.h"
 #endif /* TAO_NOTIFY_SequencePUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp
index 9e41b077127..9b9028b4e35 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp
@@ -4,18 +4,60 @@
 
 ACE_RCSID(Notify_Tests, Notify_StructuredPushConsumer, "$Id$")
 
-TAO_Notify_StructuredPushConsumer::TAO_Notify_StructuredPushConsumer (void)
+#include "ace/Arg_Shifter.h"
+#include "Name.h"
+#include "LookupManager.h"
+#include "Options_Parser.h"
+#include "orbsvcs/NotifyExtC.h"
+
+TAO_Notify_StructuredPushConsumer::TAO_Notify_StructuredPushConsumer (ACE_CString& name)
+  : poa_ (TAO_NS_Name::root_poa)
+  , name_ (name)
+  , ifgop_ (CosNotifyChannelAdmin::OR_OP)
+  , id_ (0)
 {
   // No-Op.
 }
 
 TAO_Notify_StructuredPushConsumer::~TAO_Notify_StructuredPushConsumer (void)
 {
-  // release all resources ...
-  this->default_POA_ = PortableServer::POA::_nil ();
+}
 
-  this->proxy_supplier_ =
-    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_nil ();
+int
+TAO_Notify_StructuredPushConsumer::init_state (ACE_Arg_Shifter& arg_shifter)
+{
+  const ACE_TCHAR *current_arg = 0;
+
+  while (arg_shifter.is_anything_left ())
+    {
+      if (arg_shifter.cur_arg_strncasecmp ("-Admin") == 0)
+        {
+          arg_shifter.consume_arg ();
+
+          this->admin_ = arg_shifter.get_current ();
+          arg_shifter.consume_arg ();
+        }
+      else if (arg_shifter.cur_arg_strncasecmp ("-POA") == 0)
+        { // Is a POA name specified?
+          arg_shifter.consume_arg ();
+
+          this->poa_ = arg_shifter.get_current ();
+          arg_shifter.consume_arg ();
+        }
+      else if (arg_shifter.cur_arg_strncasecmp ("-Set_QoS") == 0)
+        { // -Set_QoS [Qos Options]
+          arg_shifter.consume_arg ();
+
+          TAO_NS_Options_Parser qos_parser;
+          qos_parser.execute (this->qos_, arg_shifter);
+        }
+      else
+        {
+          break;
+        }
+    } /* while */
+
+  return 0;
 }
 
 // @@ Pradeep: do not assume that the user will activate the servant
@@ -24,8 +66,8 @@ TAO_Notify_StructuredPushConsumer::~TAO_Notify_StructuredPushConsumer (void)
 // @@ Carlos: The <connect> method will activate the servant with the supplied
 //            poa. This is the contract for clients of this class.
 //
-void TAO_Notify_StructuredPushConsumer::init
-   (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
+void
+TAO_Notify_StructuredPushConsumer::set_poa (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
@@ -58,10 +100,47 @@ TAO_Notify_StructuredPushConsumer::get_proxy_supplier (void)
 }
 
 void
-TAO_Notify_StructuredPushConsumer::connect (
-    CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-    ACE_ENV_ARG_DECL
-  )
+TAO_Notify_StructuredPushConsumer::set_qos (CosNotification::QoSProperties qos ACE_ENV_ARG_DECL)
+{
+  this->get_proxy_supplier ()->set_qos (qos ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_Notify_StructuredPushConsumer::subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL)
+{
+  // Let the user see what we're subscribed for,
+  ACE_DEBUG ((LM_DEBUG, "Calling Consumer subscription change: "));
+
+  CORBA::ULong i = 0;
+
+  for (; i < added.length (); ++i)
+    {
+      ACE_DEBUG ((LM_DEBUG, "+(%s,%s), ", added[i].domain_name.in (), added[i].type_name.in ()));
+    }
+  for (i = 0; i < removed.length (); ++i)
+    {
+      ACE_DEBUG ((LM_DEBUG, "-(%s,%s), ", removed[i].domain_name.in (), removed[i].type_name.in ()));
+    }
+
+  ACE_DEBUG ((LM_DEBUG, "\n"));
+
+  /// subscribe
+  CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr proxy_supplier = this->get_proxy_supplier ();
+
+  if (proxy_supplier != 0)
+    {
+      proxy_supplier->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+  else
+    ACE_DEBUG ((LM_DEBUG, "Proxy Supplier not available, subscription change not made."));
+}
+
+void
+TAO_Notify_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
+                                            ACE_ENV_ARG_DECL
+                                            )
 {
   // Activate the consumer with the default_POA_.
   CosNotifyComm::StructuredPushConsumer_var consumer_ref =
@@ -97,15 +176,8 @@ TAO_Notify_StructuredPushConsumer::connect (
 void
 TAO_Notify_StructuredPushConsumer::connect (CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr proxy, CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
 {
-  // Activate the consumer with the default_POA_.
-  PortableServer::ObjectId_var id =
-    this->default_POA_->activate_object (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Object_var object = this->default_POA_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CosNotifyComm::StructuredPushConsumer_var consumer_ref = CosNotifyComm::StructuredPushConsumer::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+  CosNotifyComm::StructuredPushConsumer_var consumer_ref =
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy->connect_structured_push_consumer (consumer_ref.in ()
@@ -119,6 +191,91 @@ TAO_Notify_StructuredPushConsumer::connect (CosNotifyChannelAdmin::StructuredPro
 }
 
 void
+TAO_Notify_StructuredPushConsumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+{
+  // Get the POA
+  PortableServer::POA_var poa;
+  LOOKUP_MANAGER->resolve (poa, this->poa_.c_str () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // set the POA
+  this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Resolve the consumer admin
+  CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin;
+
+  LOOKUP_MANAGER->resolve (consumer_admin, this->admin_.c_str () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  NotifyExt::ConsumerAdmin_var consumer_admin_ext;
+  consumer_admin_ext = NotifyExt::ConsumerAdmin::_narrow (consumer_admin.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Create the proxy supplier
+  CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier =
+    consumer_admin_ext->obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::STRUCTURED_EVENT
+                                                                    , this->id_, this->qos_ ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ()));
+
+  CosNotifyChannelAdmin::StructuredProxyPushSupplier_var s_proxy_supplier =
+    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (proxy_supplier.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  ACE_ASSERT (!CORBA::is_nil (s_proxy_supplier.in ()));
+
+  // connect consumer to proxy, also activates the consumer as CORBA object in the POA specified.
+  this->connect (s_proxy_supplier.in (),this->id_ ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Get hold of the reference.
+  CosNotifyComm::StructuredPushConsumer_var consumer_ref =
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Register the activated object.
+  LOOKUP_MANAGER->_register (consumer_ref.in (), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_Notify_StructuredPushConsumer::status (ACE_ENV_SINGLE_ARG_DECL)
+{
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+  ACE_TRY
+    {
+      CORBA::Boolean not_exist = this->get_proxy_supplier ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (not_exist == 1)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Consumer %s, Proxy does not exist\n",this->name_.c_str ()));
+        }
+      else
+        {
+          ACE_DEBUG ((LM_DEBUG, "Consumer %s, Proxy exists\n",this->name_.c_str ()));
+        }
+    }
+  ACE_CATCH(CORBA::TRANSIENT, ex)
+    {
+      ACE_PRINT_EXCEPTION (ex, "");
+      ACE_DEBUG ((LM_DEBUG, "Consumer %s is_equivanent transient exception.", this->name_.c_str ()));
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
+      ACE_DEBUG ((LM_DEBUG, "Consumeris_equivanent other exception.", this->name_.c_str ()));
+    }
+  ACE_ENDTRY;
+
+#else
+  return;
+#endif /* TAO_HAS_MINIMUM_CORBA */
+}
+
+void
 TAO_Notify_StructuredPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa = this->_default_POA ();
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
index d2aa7bad980..8e76e9e55c4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
@@ -21,110 +21,9 @@
 #define NOTIFY_STRUCTUREDPUSHCONSUMER_H
 #include "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
-#include "notify_test_export.h"
+#include "StructuredPushConsumer.h"
 
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_NOTIFY_TEST_Export TAO_Notify_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPushConsumer, public PortableServer::RefCountServantBase
-{
-  // = TITLE
-  //   Notify_StructuredPushConsumer
-  //
-  // = DESCRIPTION
-  //   Implements a common servant for the StructuredPushConsumer.
-  //
- public:
-  // = Initialization and Termination code
-  TAO_Notify_StructuredPushConsumer (void);
-  // Constructor.
-
-  void init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
-  // Saves the POA ref.
-
-  // Accessor to set/get our name.
-  void name (ACE_CString& name);
-  const ACE_CString& name (void);
-
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
-  // Activates this servant with the POA supplied in init.
-  // Creates a new proxy supplier via the <consumer_admin> supplied and connects
-  // to it.
-
-  void connect (CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr proxy, CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL);
-  // Activates this servant with the POA supplied in init.
-  /// Connect to given proxy
-
-  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
-  // Disconnect from the supplier.
-
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
-  // Deactivate the object from the default POA.
-
-  CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void);
-  // Accessor for <proxy_supplier_>.
-
-  // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-protected:
-  // = Data Members
-
-  /// Lock to serialize access to data members.
-  TAO_SYNCH_MUTEX lock_;
-
-  /// My name.
-  ACE_CString name_;
-
-  CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_;
-  // The proxy that we are connected to.
-
-  CosNotifyChannelAdmin::ProxyID proxy_supplier_id_;
-  // The <proxy_supplier_> id.
-
-  PortableServer::POA_var default_POA_;
-  // The default POA.
-
-  virtual ~TAO_Notify_StructuredPushConsumer (void);
-  // Destructor
-
-  // = NotifyPublish method
-    virtual void offer_change (
-        const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
-
-  // = StructuredPushSupplier methods
-  virtual void push_structured_event (
-        const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-       ));
-  // Default does nothing.
-
-  virtual void disconnect_structured_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+typedef TAO_NS_StructuredPushConsumer TAO_Notify_StructuredPushConsumer;
 
 #include "ace/post.h"
 #endif /* NOTIFY_STRUCTUREDPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp
index 091f6ef4c8f..563a87e9ab0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp
@@ -5,17 +5,58 @@
 
 ACE_RCSID(Notify_Tests, Notify_StructuredPushSupplier, "$Id$")
 
-TAO_Notify_StructuredPushSupplier::TAO_Notify_StructuredPushSupplier (void)
+#include "ace/Arg_Shifter.h"
+#include "Name.h"
+#include "LookupManager.h"
+#include "Options_Parser.h"
+#include "orbsvcs/NotifyExtC.h"
+
+TAO_Notify_StructuredPushSupplier::TAO_Notify_StructuredPushSupplier (ACE_CString& name)
+  : name_ (name)
+  , poa_ (TAO_NS_Name::root_poa)
+  , ifgop_ (CosNotifyChannelAdmin::OR_OP)
+  , id_ (0)
 {
 }
 
 TAO_Notify_StructuredPushSupplier::~TAO_Notify_StructuredPushSupplier ()
 {
-  // Release all resources.
-  this->default_POA_ = PortableServer::POA::_nil ();
+}
 
-  this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_nil ();
+int
+TAO_Notify_StructuredPushSupplier::init_state (ACE_Arg_Shifter& arg_shifter)
+{
+  while (arg_shifter.is_anything_left ())
+    {
+      if (arg_shifter.cur_arg_strncasecmp ("-Admin") == 0)
+        {
+          arg_shifter.consume_arg ();
+
+          this->admin_ = arg_shifter.get_current ();
+          arg_shifter.consume_arg ();
+        }
+      // Is a POA name specified?
+      if (arg_shifter.cur_arg_strncasecmp ("-POA") == 0)
+        {
+          arg_shifter.consume_arg ();
+
+          this->poa_ = arg_shifter.get_current ();
+          arg_shifter.consume_arg ();
+        }
+      else if (arg_shifter.cur_arg_strncasecmp ("-Set_QoS") == 0) // -Set_QoS [Qos Options]
+        {
+          arg_shifter.consume_arg ();
+
+          TAO_NS_Options_Parser qos_parser;
+          qos_parser.execute (this->qos_, arg_shifter);
+        }
+      else
+        {
+          break;
+        }
+    } /* while */
+
+  return 0;
 }
 
 void
@@ -31,8 +72,7 @@ TAO_Notify_StructuredPushSupplier::name (void)
 }
 
 void
-TAO_Notify_StructuredPushSupplier::init
-   (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredPushSupplier::set_poa (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
@@ -43,7 +83,6 @@ TAO_Notify_StructuredPushSupplier::get_proxy_consumer (void)
   return proxy_consumer_.in ();
 }
 
-
 void
 TAO_Notify_StructuredPushSupplier::connect (CosNotifyChannelAdmin::StructuredProxyPushConsumer_ptr proxy, CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
 {
@@ -63,10 +102,9 @@ TAO_Notify_StructuredPushSupplier::connect (CosNotifyChannelAdmin::StructuredPro
 }
 
 void
-TAO_Notify_StructuredPushSupplier::connect (
-    CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-    ACE_ENV_ARG_DECL
-  )
+TAO_Notify_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
+                                            ACE_ENV_ARG_DECL
+                                            )
 {
   CosNotifyComm::StructuredPushSupplier_var supplier_ref =
     this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -101,6 +139,95 @@ TAO_Notify_StructuredPushSupplier::connect (
 }
 
 void
+TAO_Notify_StructuredPushSupplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+{
+  // Get the POA
+  PortableServer::POA_var poa;
+  LOOKUP_MANAGER->resolve (poa);
+
+  // set the POA
+  this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Resolve the supplier admin
+  CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin;
+
+  LOOKUP_MANAGER->resolve (supplier_admin, this->admin_.c_str () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  NotifyExt::SupplierAdmin_var supplier_admin_ext;
+  supplier_admin_ext = NotifyExt::SupplierAdmin::_narrow (supplier_admin.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // create the proxy consumer
+  CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer =
+    supplier_admin_ext->obtain_notification_push_consumer_with_qos (CosNotifyChannelAdmin::STRUCTURED_EVENT
+                                                                    , this->id_, this->qos_ ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ()));
+
+  CosNotifyChannelAdmin::StructuredProxyPushConsumer_var s_proxy_consumer =
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxy_consumer.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  ACE_ASSERT (!CORBA::is_nil (s_proxy_consumer.in ()));
+
+  // connect supplier to proxy, also activates the Supplier as CORBA object in the POA specified.
+  this->connect (s_proxy_consumer.in (),this->id_  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  CosNotifyComm::StructuredPushSupplier_var supplier_ref =
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Register the proxy consumer.
+  LOOKUP_MANAGER->_register (supplier_ref.in (), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_Notify_StructuredPushSupplier::set_qos (CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL)
+{
+  this->get_proxy_consumer ()->set_qos (qos ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_Notify_StructuredPushSupplier::status (ACE_ENV_SINGLE_ARG_DECL)
+{
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+  ACE_TRY
+    {
+      CORBA::Boolean not_exist = this->get_proxy_consumer ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (not_exist == 1)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Supplier %s, Proxy does not exist\n",this->name_.c_str ()));
+        }
+      else
+        {
+          ACE_DEBUG ((LM_DEBUG, "Supplier %s, Proxy exists\n",this->name_.c_str ()));
+        }
+    }
+  ACE_CATCH(CORBA::TRANSIENT, ex)
+    {
+      ACE_PRINT_EXCEPTION (ex, "");
+      ACE_DEBUG ((LM_DEBUG, "Supplier %s is_equivanent transient exception.", this->name_.c_str ()));
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
+      ACE_DEBUG ((LM_DEBUG, "Supplieris_equivanent other exception.", this->name_.c_str ()));
+    }
+  ACE_ENDTRY;
+#else
+  return;
+#endif /* TAO_HAS_MINIMUM_CORBA */
+}
+
+void
 TAO_Notify_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
@@ -114,6 +241,32 @@ TAO_Notify_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
+TAO_Notify_StructuredPushSupplier::offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL)
+{
+  // Let the user see what we're subscribed for,
+  ACE_DEBUG ((LM_DEBUG, "(%P, %t) Calling Supplier offer change: \n"));
+
+  CORBA::ULong i = 0;
+
+  for (; i < added.length (); ++i)
+    {
+      ACE_DEBUG ((LM_DEBUG, "+(%s,%s), ", added[i].domain_name.in (), added[i].type_name.in ()));
+    }
+  for (i = 0; i < removed.length (); ++i)
+    {
+      ACE_DEBUG ((LM_DEBUG, "-(%s,%s), ", removed[i].domain_name.in (), removed[i].type_name.in ()));
+    }
+
+  ACE_DEBUG ((LM_DEBUG, "\n"));
+
+  /// subscribe
+  CosNotifyChannelAdmin::StructuredProxyPushConsumer_ptr proxy_consumer = this->get_proxy_consumer ();
+
+  proxy_consumer->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
 TAO_Notify_StructuredPushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
index 94f522346a5..7a658e9df91 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
@@ -21,101 +21,9 @@
 #define TAO_NOTIFY_STRUCTUREDPUSHSUPPLIER_H
 #include "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
-#include "notify_test_export.h"
+#include "StructuredPushSupplier.h"
 
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_NOTIFY_TEST_Export TAO_Notify_StructuredPushSupplier:public POA_CosNotifyComm::StructuredPushSupplier, public PortableServer::RefCountServantBase
-{
-  // = TITLE
-  //   TAO_Notify_StructuredPushSupplier
-  //
-  // = DESCRIPTION
-  //   Implements rudimentary StructuredPushSupplier functionality.
-  //
- public:
-  // = Initialization and Termination code
-  TAO_Notify_StructuredPushSupplier (void);
-  // Constructor.
-
-  void init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL);
-  // Init
-
-  // Accessor to set/get our name.
-  void name (ACE_CString& name);
-  const ACE_CString& name (void);
-
-  void connect (CosNotifyChannelAdmin::StructuredProxyPushConsumer_ptr proxy, CosNotifyChannelAdmin::ProxyID ACE_ENV_ARG_DECL);
-  // Activates this servant with the POA supplied in init.
-  // Connects to given proxy.
-
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL);
-  // Activates this servant with the POA supplied in init.
-  // Creates a new proxy supplier and connects to it.
-
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
-  // Disconnect from the supplier.
-
-  virtual void send_event (const CosNotification::StructuredEvent& event
-                           ACE_ENV_ARG_DECL);
-  // Send one event.
-
-  CosNotifyChannelAdmin::StructuredProxyPushConsumer_ptr get_proxy_consumer (void);
-  // Accessor for <proxy_consumer_>.
-
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
-  // Deactivate the object.
-
-  // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-protected:
-  // = Data Members
-
-  /// My name.
-  ACE_CString name_;
-
-  CosNotifyChannelAdmin::StructuredProxyPushConsumer_var proxy_consumer_;
-  // The proxy that we are connected to.
-
-  CosNotifyChannelAdmin::ProxyID proxy_consumer_id_;
-  // This <proxy_consumer_> id.
-
-  PortableServer::POA_var default_POA_;
-  // The default POA.
-
-  virtual ~TAO_Notify_StructuredPushSupplier ();
-  // Destructor
-
-  // = NotifySubscribe
-    virtual void subscription_change (
-        const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      ));
-
-    // = StructuredPushSupplier method
-    virtual void disconnect_structured_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+typedef TAO_NS_StructuredPushSupplier TAO_Notify_StructuredPushSupplier;
 
 #include "ace/post.h"
 #endif /* TAO_NOTIFY_STRUCTUREDPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index d42600729c8..519c8877ed2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -50,13 +50,13 @@ void
 TAO_NS_Options_Parser::execute (CosNotification::QoSProperties& qos, ACE_Arg_Shifter& arg_shifter)
 {
   const ACE_TCHAR *current_arg = 0;
+  int default_priority = ACE_DEFAULT_THREAD_PRIORITY;
 
   if (arg_shifter.cur_arg_strncasecmp ("-ThreadPool") == 0) // -ThreadPool [-Threads static_threads] [-Priority default_priority]
     {
       arg_shifter.consume_arg ();
 
       int static_threads = 1;
-      int default_priority = ACE_DEFAULT_THREAD_PRIORITY;
 
       if (arg_shifter.cur_arg_strncasecmp ("-Threads") == 0)
         {
@@ -80,7 +80,10 @@ TAO_NS_Options_Parser::execute (CosNotification::QoSProperties& qos, ACE_Arg_Shi
           arg_shifter.consume_arg ();
         }
 
-      NotifyExt::ThreadPoolParams tp_params = {0, static_threads, 0, default_priority, 0, 0, 0 };
+      NotifyExt::ThreadPoolParams tp_params
+        = { NotifyExt::CLIENT_PROPAGATED, default_priority,
+            0, static_threads, 0, default_priority, 0, 0, 0 };
+
       qos.length (1);
       qos[0].name = CORBA::string_dup (NotifyExt::ThreadPool);
       qos[0].value <<= tp_params;
@@ -97,6 +100,8 @@ TAO_NS_Options_Parser::execute (CosNotification::QoSProperties& qos, ACE_Arg_Shi
 
       NotifyExt::ThreadPoolLanesParams tpl_params;
 
+      tpl_params.priority_model = NotifyExt::CLIENT_PROPAGATED;
+      tpl_params.server_priority = default_priority,
       tpl_params.stacksize = 0;
       tpl_params.lanes.length (lanecount);
       tpl_params.allow_borrowing = 0;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
new file mode 100644
index 00000000000..974a53c3313
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
@@ -0,0 +1,93 @@
+// $Id$
+
+#include "Peer.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "Peer.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(lib, TAO_Peer, "$id$")
+
+#include "ace/Arg_Shifter.h"
+#include "Name.h"
+#include "LookupManager.h"
+#include "Options_Parser.h"
+#include "orbsvcs/NotifyExtC.h"
+
+TAO_NS_Peer::TAO_NS_Peer (void)
+  : poa_name_ (TAO_NS_Name::root_poa)
+  , ifgop_ (CosNotifyChannelAdmin::OR_OP)
+{
+}
+
+TAO_NS_Peer::~TAO_NS_Peer ()
+{
+}
+
+void
+TAO_NS_Peer::init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
+{
+  this->default_POA_ = PortableServer::POA::_duplicate (poa);
+}
+
+int
+TAO_NS_Peer::init_state (ACE_Arg_Shifter& arg_shifter)
+{
+  while (arg_shifter.is_anything_left ())
+    {
+      if (arg_shifter.cur_arg_strncasecmp ("-Admin") == 0)
+        {
+          arg_shifter.consume_arg ();
+
+          this->admin_name_ = arg_shifter.get_current ();
+          arg_shifter.consume_arg ();
+        }
+      else if (arg_shifter.cur_arg_strncasecmp ("-Proxy") == 0)
+        {
+          arg_shifter.consume_arg ();
+
+          this->proxy_name_ = arg_shifter.get_current ();
+          arg_shifter.consume_arg ();
+        }
+      // Is a POA name specified?
+      else if (arg_shifter.cur_arg_strncasecmp ("-POA") == 0)
+        {
+          arg_shifter.consume_arg ();
+
+          this->poa_name_ = arg_shifter.get_current ();
+          arg_shifter.consume_arg ();
+        }
+      else if (arg_shifter.cur_arg_strncasecmp ("-Set_QoS") == 0) // -Set_QoS [Qos Options]
+        {
+          arg_shifter.consume_arg ();
+
+          TAO_NS_Options_Parser qos_parser;
+          qos_parser.execute (this->qos_, arg_shifter);
+        }
+      else
+        {
+          break;
+        }
+    } /* while */
+
+  return 0;
+}
+
+void
+TAO_NS_Peer::set_name (ACE_CString& name)
+{
+  this->name_ = name;
+}
+
+const ACE_CString&
+TAO_NS_Peer::get_name (void)
+{
+  return this->name_;
+}
+
+void
+TAO_NS_Peer::set_poa (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
+{
+  this->default_POA_ = PortableServer::POA::_duplicate (poa);
+}
+
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h
new file mode 100644
index 00000000000..2c4a049b8ff
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h
@@ -0,0 +1,80 @@
+/* -*- C++ -*- */
+/**
+ *  @file Peer.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_PEER_H
+#define TAO_NS_PEER_H
+#include "ace/pre.h"
+
+#include "notify_test_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
+#include "tao/PortableServer/PortableServer.h"
+
+class ACE_Arg_Shifter;
+
+/**
+ * @class TAO_NS_Peer
+ *
+ * @brief
+ *
+ */
+class TAO_NOTIFY_TEST_Export TAO_NS_Peer
+{
+public:
+  /// Constuctor
+  TAO_NS_Peer (void);
+
+  /// Destructor
+  virtual ~TAO_NS_Peer ();
+
+  /// Init
+  void init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED);
+
+  /// Init this object.
+  virtual int init_state (ACE_Arg_Shifter& arg_shifter);
+
+  /// Set POA
+  void set_poa (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL);
+
+  // Accessor to set/get our name.
+  void set_name (ACE_CString& name);
+  const ACE_CString& get_name (void);
+
+protected:
+
+  /// My name.
+  ACE_CString name_;
+
+  /// Proxy Name.
+  ACE_CString proxy_name_;
+
+  ACE_CString admin_name_;
+
+  ACE_CString poa_name_;
+
+  CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_;
+
+  CosNotification::QoSProperties qos_;
+
+  /// The default POA.
+  PortableServer::POA_var default_POA_;
+};
+
+#if defined (__ACE_INLINE__)
+#include "Peer.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /* TAO_NS_PEER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.inl b/TAO/orbsvcs/tests/Notify/lib/Peer.inl
new file mode 100644
index 00000000000..b29bbd147fb
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.inl
@@ -0,0 +1,3 @@
+// $Id$
+
+#include "Peer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
new file mode 100644
index 00000000000..a1e7fb4f9ee
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -0,0 +1,184 @@
+// $Id$
+#ifndef TAO_NS_Peer_T_CPP
+#define TAO_NS_Peer_T_CPP
+
+#include "Peer_T.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "Peer_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(Notify, TAO_NS_Peer_T, "$id$")
+
+#include "ace/Arg_Shifter.h"
+#include "Name.h"
+#include "LookupManager.h"
+#include "Options_Parser.h"
+#include "orbsvcs/NotifyExtC.h"
+
+template <class Peer_Traits>
+TAO_NS_Peer_T<Peer_Traits>::TAO_NS_Peer_T (void)
+  : proxy_id_ (0)
+{
+}
+
+template <class Peer_Traits>
+TAO_NS_Peer_T<Peer_Traits>::~TAO_NS_Peer_T ()
+{
+}
+
+template <class Peer_Traits> TAO_NS_Peer_T<Peer_Traits>::Proxy_Traits_PTR
+TAO_NS_Peer_T<Peer_Traits>::get_proxy (void)
+{
+  return proxy_.in ();
+}
+
+template <class Peer_Traits> TAO_NS_Peer_T<Peer_Traits>::Peer_Traits_PTR
+TAO_NS_Peer_T<Peer_Traits>::activate (ACE_ENV_SINGLE_ARG_DECL)
+{
+  return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+template <class Peer_Traits> void
+TAO_NS_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy, Proxy_Traits_ID proxy_id ACE_ENV_ARG_DECL)
+{
+  PortableServer::ServantBase_var servant_var (this);
+
+  ACE_TYPENAME Peer_Traits::VAR peer_var = this->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->connect_to_peer (proxy, peer_var.in () ACE_ENV_ARG_PARAMETER);
+
+  // save the proxy
+  this->proxy_ = Proxy_Traits_INTERFACE::_duplicate (proxy);
+  this->proxy_id_ = proxy_id;
+
+  // Register the proxy.
+  if (this->proxy_name_.length () != 0)
+    LOOKUP_MANAGER->_register (this->proxy_.in ()
+                               , this->proxy_name_.c_str () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+template <class Peer_Traits> void
+TAO_NS_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL)
+{
+  ACE_TYPENAME Proxy_Traits::VAR proxy_var = this->obtain_proxy (admin_ptr ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  ACE_ASSERT (!CORBA::is_nil (proxy_var.in ()));
+
+  this->connect (proxy_var.in ()
+                 , this->proxy_id_  ACE_ENV_ARG_PARAMETER);
+}
+
+
+template <class Peer_Traits> void
+TAO_NS_Peer_T<Peer_Traits>::connect (ACE_ENV_SINGLE_ARG_DECL)
+{
+  // Get the POA
+  PortableServer::POA_var poa;
+  LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // set the POA
+  this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Resolve the admin
+  ACE_TYPENAME Admin_Traits::VAR admin_var;
+
+  LOOKUP_MANAGER->resolve (admin_var, this->admin_name_.c_str () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  ACE_TYPENAME Admin_Ext_Traits::VAR admin_ext_var =
+    Admin_Ext_Traits_INTERFACE::_narrow (admin_var.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  ACE_TYPENAME Proxy_Traits::VAR proxy_var = this->obtain_proxy (admin_ext_var.in ()
+                                                                 , this->qos_
+                                                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  ACE_ASSERT (!CORBA::is_nil (proxy_var.in ()));
+
+  // connect supplier to proxy,
+  // also activates the servant as CORBA object in the POA specified.
+  this->connect (proxy_var.in (), this->proxy_id_  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+template <class Peer_Traits> void
+TAO_NS_Peer_T<Peer_Traits>::set_qos (CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL)
+{
+  this->get_proxy ()->set_qos (qos ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+template <class Peer_Traits> void
+TAO_NS_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL)
+{
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+  ACE_TRY
+    {
+      CORBA::Boolean not_exist = this->get_proxy ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (not_exist == 1)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Peer %s, Proxy does not exist\n",this->name_.c_str ()));
+        }
+      else
+        {
+          ACE_DEBUG ((LM_DEBUG, "Peer %s, Proxy exists\n",this->name_.c_str ()));
+        }
+    }
+  ACE_CATCH(CORBA::TRANSIENT, ex)
+    {
+      ACE_PRINT_EXCEPTION (ex, "");
+      ACE_DEBUG ((LM_DEBUG, "Peer %s is_equivalent transient exception.", this->name_.c_str ()));
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
+      ACE_DEBUG ((LM_DEBUG, "Peer %s is_equivanent other exception.", this->name_.c_str ()));
+    }
+  ACE_ENDTRY;
+#else
+  return;
+#endif /* TAO_HAS_MINIMUM_CORBA */
+}
+
+template <class Peer_Traits> void
+TAO_NS_Peer_T<Peer_Traits>::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+{
+  ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
+
+  this->disconnect_from_proxy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+template <class Peer_Traits> PortableServer::POA_ptr
+TAO_NS_Peer_T<Peer_Traits>::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+{
+  return PortableServer::POA::_duplicate (this->default_POA_.in ());
+}
+
+template <class Peer_Traits> void
+TAO_NS_Peer_T<Peer_Traits>::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+{
+  PortableServer::POA_var poa = this->_default_POA ();
+
+  PortableServer::ObjectId_var id =
+    poa->servant_to_id (this
+                        ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  poa->deactivate_object (id.in ()
+                          ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+#endif /* TAO_NS_Peer_T_CPP */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
new file mode 100644
index 00000000000..6dd937c6dfc
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -0,0 +1,127 @@
+/* -*- C++ -*- */
+/**
+ *  @file Peer_T.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_PEER_T_H
+#define TAO_NS_PEER_T_H
+#include "ace/pre.h"
+
+#include "notify_test_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Peer.h"
+#include "tao/PortableServer/Servant_Base.h"
+
+/**
+ * @class TAO_NS_Peer_T
+ *
+ * @brief
+ *
+ */
+template <class Peer_Traits>
+class TAO_NOTIFY_TEST_Export TAO_NS_Peer_T : public TAO_NS_Peer, public Peer_Traits::SKELETON, public PortableServer::RefCountServantBase
+{
+  typedef ACE_TYPENAME Peer_Traits::Admin_Traits Admin_Traits;
+  typedef ACE_TYPENAME Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
+  typedef ACE_TYPENAME Peer_Traits::Proxy_Traits Proxy_Traits;
+
+  typedef ACE_TYPENAME Peer_Traits::PTR Peer_Traits_PTR;
+
+  typedef ACE_TYPENAME Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE;
+  typedef ACE_TYPENAME Proxy_Traits::PTR Proxy_Traits_PTR;
+  typedef ACE_TYPENAME Proxy_Traits::ID Proxy_Traits_ID;
+
+  typedef ACE_TYPENAME Admin_Traits::PTR Admin_Traits_PTR;
+
+  typedef ACE_TYPENAME Admin_Ext_Traits::INTERFACE Admin_Ext_Traits_INTERFACE;
+  typedef ACE_TYPENAME Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR;
+
+public:
+  /// Constuctor
+  TAO_NS_Peer_T (void);
+
+  /// Destructor
+  virtual ~TAO_NS_Peer_T ();
+
+  // Activates this servant with the POA supplied in init.
+  // Connects to given proxy.
+  void connect (Proxy_Traits_PTR proxy, Proxy_Traits_ID proxy_id ACE_ENV_ARG_DECL);
+
+  // Activates this servant with the POA supplied in init.
+  // Creates a new proxy supplier and connects to it.
+  void connect (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL);
+
+  /// Connect using options parsed and set initial QoS.
+  virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
+
+  // Disconnect from the Peer.
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+
+  /// Set Qos
+  void set_qos (CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL);
+
+  /// Dump status
+  void status (ACE_ENV_SINGLE_ARG_DECL);
+
+  // Accessor for <proxy_>.
+  Proxy_Traits_PTR get_proxy (void);
+
+  /// Deactivate the object.
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+
+  // = ServantBase operations
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
+protected:
+  /// Activate this object in the default POA.
+  virtual Peer_Traits_PTR activate (ACE_ENV_SINGLE_ARG_DECL);
+
+  ///= To be implemented by specializations.
+
+  /// Connect to Peer.
+  virtual void connect_to_peer (Proxy_Traits_PTR proxy_ptr, Peer_Traits_PTR peer_ptr ACE_ENV_ARG_DECL) = 0;
+
+  /// Obtain Proxy.
+  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL) = 0;
+
+  /// Obtain Proxy with QoS.
+  virtual Proxy_Traits_PTR obtain_proxy (Admin_Ext_Traits_PTR admin_ptr
+                                         , CosNotification::QoSProperties& qos
+                                         ACE_ENV_ARG_DECL) = 0;
+
+  /// Disconnect from proxy.
+  virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL) = 0;
+
+  // = Data Members
+
+  /// The proxy that we are connected to.
+   ACE_TYPENAME Proxy_Traits::VAR proxy_;
+
+  /// This <proxy_> id.
+   ACE_TYPENAME Proxy_Traits::ID proxy_id_;
+};
+
+#if defined (__ACE_INLINE__)
+#include "Peer_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Peer_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Peer_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+#endif /* TAO_NS_PEER_T_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.inl b/TAO/orbsvcs/tests/Notify/lib/Peer_T.inl
new file mode 100644
index 00000000000..74e88caa0c5
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.inl
@@ -0,0 +1,2 @@
+// $Id$
+
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index b9fdc3b980d..1ace1e5fe8c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -14,8 +14,16 @@
 
 ACE_RCSID(RT_Notify, TAO_NS_Periodic_Consumer, "$id$")
 
+int WARMUP_COUNT = 10;
+
 TAO_NS_Periodic_Consumer::TAO_NS_Periodic_Consumer (void)
-  :count_ (0), max_count_ (-1), client_ (0), check_priority_ (0)
+  : count_ (-2)
+  , warmup_countdown_ (WARMUP_COUNT)
+  , max_count_ (-1)
+  , load_ (0)
+  , client_ (0)
+  , check_priority_ (0)
+  , stop_received_ (0)
 {
 }
 
@@ -32,16 +40,15 @@ TAO_NS_Periodic_Consumer::task_callback (TAO_NS_Task_Callback* client)
 int
 TAO_NS_Periodic_Consumer::init_state (ACE_Arg_Shifter& arg_shifter)
 {
+  // First, let the base class look for options.
+  if (TAO_Notify_StructuredPushConsumer::init_state (arg_shifter) == -1)
+    return -1;
+
   const ACE_TCHAR *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
-       if ((current_arg = arg_shifter.get_the_parameter ("-Proxy")))
-        {
-          proxy_name_ = current_arg;
-          arg_shifter.consume_arg ();
-        }
-       else if ((current_arg = arg_shifter.get_the_parameter ("-MaxCount")))
+      if ((current_arg = arg_shifter.get_the_parameter ("-MaxCount")))
         {
           this->max_count_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
@@ -67,50 +74,98 @@ TAO_NS_Periodic_Consumer::init_state (ACE_Arg_Shifter& arg_shifter)
   return 0;
 }
 
-const char*
-TAO_NS_Periodic_Consumer::proxy_name (void)
-{
-  return this->proxy_name_.c_str ();
-}
-
 void
-TAO_NS_Periodic_Consumer::connect (CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr proxy, CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
+TAO_NS_Periodic_Consumer::handle_start_event (const CosNotification::PropertySeq& prop_seq)
 {
-  TAO_Notify_StructuredPushConsumer::connect (proxy, proxy_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG, "(%P, %t)Consumer %s received inital (-1)th event \n", this->name_.c_str ()));
 
-void
-TAO_NS_Periodic_Consumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL)
-{
-  TAO_Notify_StructuredPushConsumer::connect (consumer_admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  for (CORBA::ULong i = 0; i < prop_seq.length (); ++i)
+    {
+      if (ACE_OS::strcmp (prop_seq[i].name.in (), "BaseTime") == 0)
+        {
+          TimeBase::TimeT base_time;
+          ACE_hrtime_t base_time_hrtime;
+
+          prop_seq[i].value >>= base_time;
+
+          ORBSVCS_Time::TimeT_to_hrtime (base_time_hrtime, base_time);
+          stats_.base_time (base_time_hrtime);
+        }
+      // if max_count has not been already specified, get it from the supplier.
+      else if (this->max_count_ == -1 &&
+               ACE_OS::strcmp (prop_seq[i].name.in (), "MaxCount") == 0)
+        {
+          prop_seq[i].value >>= this->max_count_;
+
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG, "(%P, %t) Setting Maxcount = %d\n",
+                        this->max_count_));
+        }
+      else if (ACE_OS::strcmp (prop_seq[i].name.in (), "Load") == 0)
+        {
+          prop_seq[i].value >>= this->load_;
+
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG, "(%P, %t) Setting Load = %d\n",
+                        this->load_));
+        }
+    }
 }
 
 void
-TAO_NS_Periodic_Consumer::subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_NS_Periodic_Consumer::check_priority (const CosNotification::PropertySeq& prop_seq)
 {
-  // Let the user see what we're subscribed for,
-  ACE_DEBUG ((LM_DEBUG, "Calling Consumer subscription change: "));
-
-  CORBA::ULong i = 0;
+  // Check if the event carries a Priority.
+  int event_has_priority_set = 0;
+  CORBA::Short event_priority = 0;
 
-  for (; i < added.length (); ++i)
+  for (CORBA::ULong i = 0; i < prop_seq.length (); ++i)
     {
-      ACE_DEBUG ((LM_DEBUG, "+(%s,%s), ", added[i].domain_name.in (), added[i].type_name.in ()));
+      if (ACE_OS::strcmp (prop_seq[i].name.in (), CosNotification::Priority) == 0)
+        {
+          prop_seq[i].value >>= event_priority;
+
+          event_has_priority_set = 1;
+              break;
+        }
     }
-  for (i = 0; i < removed.length (); ++i)
+
+  if (event_has_priority_set == 1)
     {
-      ACE_DEBUG ((LM_DEBUG, "-(%s,%s), ", removed[i].domain_name.in (), removed[i].type_name.in ()));
-    }
+      // Confirm that the current thread is at the priority set in the event
+      ACE_hthread_t current;
+      ACE_Thread::self (current);
+
+      int priority;
+      if (ACE_Thread::getprio (current, priority) == -1)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("TAO (%P|%t) - ")
+                      ACE_TEXT (" ACE_Thread::get_prio\n")));
 
-  ACE_DEBUG ((LM_DEBUG, "\n"));
+          return ;
+        }
 
-  /// subscribe
-  CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr proxy_supplier = this->get_proxy_supplier ();
+      CORBA::Short native_priority = CORBA::Short (priority);
 
-  proxy_supplier->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      TAO_NS_Priority_Mapping* priority_mapping;
+      LOOKUP_MANAGER->resolve (priority_mapping);
+
+      CORBA::Short corba_priority;
+
+      priority_mapping->to_CORBA (native_priority, corba_priority);
+
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "Periodic Consumer expected priority = %d, received priority = %d/%d (native/corba)\n",
+                    event_priority, native_priority, corba_priority));
+
+      if (corba_priority != event_priority)
+        ACE_DEBUG ((LM_DEBUG,
+                    "Error: Periodic Consumer expected priority = %d, received priority = %d\n",
+                    event_priority, corba_priority));
+    }
 }
 
 void
@@ -124,94 +179,43 @@ TAO_NS_Periodic_Consumer::push_structured_event (const CosNotification::Structur
                       CORBA::INTERNAL ());
   ACE_CHECK;
 
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P, %t)Consumer %s received %d event type (%s,%s) \n", this->name_.c_str (), this->count_,
-                  notification.header.fixed_header.event_type.domain_name.in(),
-                  notification.header.fixed_header.event_type.type_name.in()));
-    }
-
-  if (this->count_ == 0)
-  {
-    const CosNotification::PropertySeq& prop_seq = notification.header.variable_header;
+  const CosNotification::PropertySeq& prop_seq =
+    notification.header.variable_header;
 
-    for (CORBA::ULong i = 0; i < prop_seq.length (); ++i)
+  if (this->count_ == -2)
     {
-      if (ACE_OS::strcmp (prop_seq[i].name.in (), "BaseTime") == 0)
-        {
-          TimeBase::TimeT base_time;
-          ACE_hrtime_t base_time_hrtime;
+      if (--warmup_countdown_ == 0)
+        this->count_ = -1;
 
-          prop_seq[i].value >>= base_time;
+      return;
+    }
+  else if (this->count_ == -1)
+    {
+      this->handle_start_event (prop_seq);
 
-          ORBSVCS_Time::TimeT_to_hrtime (base_time_hrtime, base_time);
-          stats_.base_time (base_time_hrtime);
-        } // if max_count has not been already specified, get it from the supplier.
-      else if (this->max_count_ == -1 && ACE_OS::strcmp (prop_seq[i].name.in (), "MaxCount") == 0)
-        {
-          prop_seq[i].value >>= this->max_count_;
+      this->stats_.init (this->max_count_);
 
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG, "(%P, %t) Setting Maxcount = %d\n", this->max_count_));
-        }
+      this->count_ = 0;
+      return;
     }
 
-    this->stats_.init (this->max_count_);
-  }
-
   if (this->check_priority_)
     {
-      // Check if the event carries a Priority.
-      const CosNotification::PropertySeq& prop_seq = notification.header.variable_header;
-
-      int event_has_priority_set = 0;
-      CORBA::Short event_priority = 0;
-
-      for (CORBA::ULong i = 0; i < prop_seq.length (); ++i)
-        {
-          if (ACE_OS::strcmp (prop_seq[i].name.in (), CosNotification::Priority) == 0)
-            {
-              prop_seq[i].value >>= event_priority;
+      this->check_priority (prop_seq);
+    }
 
-              event_has_priority_set = 1;
-              break;
-            }
-        }
+  if (TAO_debug_level > 0)
+    {
+      ACE_DEBUG ((LM_DEBUG, "(%P, %t)Consumer %s received %d event type (%s,%s) \n", this->name_.c_str (), this->count_,
+                  notification.header.fixed_header.event_type.domain_name.in(),
+                  notification.header.fixed_header.event_type.type_name.in()));
+    }
 
-      if (event_has_priority_set == 1)
+  for (CORBA::ULong i = 0; i < prop_seq.length (); ++i)
+    {
+      if (ACE_OS::strcmp (prop_seq[i].name.in (), "Stop") == 0)
         {
-          // Confirm that the current thread is at the priority set in the event
-          ACE_hthread_t current;
-          ACE_Thread::self (current);
-
-          int priority;
-          if (ACE_Thread::getprio (current, priority) == -1)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO (%P|%t) - ")
-                          ACE_TEXT (" ACE_Thread::get_prio\n")));
-
-              return ;
-            }
-
-          CORBA::Short native_priority = CORBA::Short (priority);
-
-          TAO_NS_Priority_Mapping* priority_mapping;
-          LOOKUP_MANAGER->resolve (priority_mapping);
-
-          CORBA::Short corba_priority;
-
-          priority_mapping->to_CORBA (native_priority, corba_priority);
-
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Periodic Consumer expected priority = %d, received priority = %d\n",
-                        event_priority, corba_priority));
-
-          if (corba_priority != event_priority)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Error: Periodic Consumer expected priority = %d, received priority = %d\n",
-                        event_priority, corba_priority));
+          this->stop_received_ = 1;
         }
     }
 
@@ -226,26 +230,37 @@ TAO_NS_Periodic_Consumer::push_structured_event (const CosNotification::Structur
 
   stats_.sample (send_time_hrtime, now);
 
-  if (++this->count_ >= this->max_count_ )
+  // Eat CPU
+  static CORBA::ULong prime_number = 9619;
+
+  for (CORBA::ULong load = this->load_; load != 0; --load)
+    ACE::is_prime (prime_number,
+                   2,
+                   prime_number / 2);
+
+  // ---
+
+  if (++this->count_ >= this->max_count_ || this->stop_received_ == 1)
     {
       stats_.end_time (ACE_OS::gethrtime ());
 
       if (this->client_)
         this->client_->done (this);
-    }
+        }
 }
 
 void
 TAO_NS_Periodic_Consumer::dump_stats (ACE_TCHAR* msg)
 {
   char buf[BUFSIZ];
-  ACE_OS::sprintf (buf, "Consumer_%s_%d.dat", this->name_.c_str (), this->proxy_supplier_id_);
+  ACE_OS::sprintf (buf, "%s.dat", this->name_.c_str ());
 
   ACE_CString fname (buf);
 
-  ACE_OS::sprintf (buf,"(%s) Consumer Name = %s, Proxy ID = %d\n",
-                   msg, this->name_.c_str (), this->proxy_supplier_id_);
+  ACE_OS::sprintf (buf,
+                   "%s# Consumer Name = %s, Proxy ID = %d Samples Received = %d\n",
+                   msg,
+                   this->name_.c_str (), this->proxy_id_, this->count_);
 
-  stats_.dump_samples (fname.c_str (), buf,
-                             ACE_High_Res_Timer::global_scale_factor ());
+  stats_.dump_samples (fname.c_str (), buf);
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index 660f0adb287..30fc652e1f2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -19,8 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Notify_StructuredPushConsumer.h"
 #include "Task_Stats.h"
+#include "Notify_StructuredPushConsumer.h"
 
 class TAO_NS_Task_Callback;
 class ACE_Barrier;
@@ -45,23 +45,11 @@ public:
   void task_callback(TAO_NS_Task_Callback* client);
 
   /// Init the state of this object.
-  int init_state (ACE_Arg_Shifter& arg_shifter);
-
-  /// Connect.
-  void connect (CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr proxy, CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL);
-
-  /// connect
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
-
-  /// Subscription change.
-  void subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL);
+  virtual int init_state (ACE_Arg_Shifter& arg_shifter);
 
   /// dump stats
   void dump_stats (ACE_TCHAR* msg);
 
-    /// Get the name of the proxy
-  const char* proxy_name (void);
-
 protected:
 
   virtual void push_structured_event (
@@ -73,19 +61,27 @@ protected:
         CosEventComm::Disconnected
        ));
 
-  /// = Data members.
+  void handle_start_event (const CosNotification::PropertySeq& prop_seq);
+  void check_priority (const CosNotification::PropertySeq& prop_seq);
 
-  /// The name of the proxy we connect to.
-  ACE_CString proxy_name_;
+  /// = Data members.
+  /// Serialize state.
+  TAO_SYNCH_MUTEX lock_;
 
   /// count of events received.
   int count_;
 
+  /// We need to count down these initial events.
+  int warmup_countdown_;
+
   /// max events expected.
   /// Sometimes max count may not be the number of events that the supplier will send.
   /// A filter might not allow some events to through. we can tell the consumer what to expect.
   int max_count_;
 
+  /// The Load
+  CORBA::ULong load_;
+
   /// Stats house keeping
   Task_Stats stats_;
 
@@ -94,6 +90,9 @@ protected:
 
   /// Flag to indicate if we want to check the expected priority.
   int check_priority_;
+
+  /// This Flag is set if we received an event asking us to "Stop".
+  int stop_received_;
 };
 
 #include "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index 6759b39ae83..62531a0a5d6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -7,12 +7,13 @@ ACE_RCSID(lib, TAO_Periodic_Consumer_Command, "$id$")
 #include "LookupManager.h"
 #include "Name.h"
 #include "Periodic_Consumer.h"
+#include "Relay_Consumer.h"
+#include "Direct_Consumer.h"
 #include "Activation_Manager.h"
 #include "Options_Parser.h"
 #include "orbsvcs/NotifyExtC.h"
 
 TAO_NS_Periodic_Consumer_Command::TAO_NS_Periodic_Consumer_Command (void)
-: poa_ (TAO_NS_Name::root_poa), ifgop_ (CosNotifyChannelAdmin::OR_OP), id_ (0)
 {
 }
 
@@ -47,28 +48,37 @@ TAO_NS_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
           this->name_ = arg_shifter.get_current ();
           arg_shifter.consume_arg ();
 
-          this->admin_ = arg_shifter.get_current ();
-          arg_shifter.consume_arg ();
+          int is_relay = 0;
+          int is_direct = 0;
+          ACE_CString relay_destination;
+
+          if (arg_shifter.cur_arg_strncasecmp ("-Relay") == 0)
+            {
+              is_relay = 1;
+
+              arg_shifter.consume_arg ();
 
-          // Is a POA name specified?
-         if (arg_shifter.cur_arg_strncasecmp ("-POA") == 0)
-           {
-             arg_shifter.consume_arg ();
+              relay_destination = arg_shifter.get_current ();
+              arg_shifter.consume_arg ();
+            }
+          else if (arg_shifter.cur_arg_strncasecmp ("-Direct") == 0)
+            {
+              is_direct = 1;
 
-             this->poa_ = arg_shifter.get_current ();
-             arg_shifter.consume_arg ();
-           }
+              arg_shifter.consume_arg ();
+            }
 
-         if (arg_shifter.cur_arg_strncasecmp ("-Set_QoS") == 0) // -Set_QoS [Qos Options]
-           {
-             arg_shifter.consume_arg ();
+          TAO_NS_Periodic_Consumer* consumer = 0;
 
-             TAO_NS_Options_Parser qos_parser;
-             qos_parser.execute (this->qos_, arg_shifter);
-           }
+          // create the consumer
+          if (is_relay == 1)
+            consumer = new TAO_NS_Relay_Consumer (relay_destination);
+          else if (is_direct == 1)
+            consumer = new TAO_NS_Direct_Consumer ();
+          else
+            consumer = new TAO_NS_Periodic_Consumer ();
 
-         // create the consumer
-         TAO_NS_Periodic_Consumer* consumer = new TAO_NS_Periodic_Consumer ();
+          consumer->set_name (this->name_);
 
          TAO_NS_Activation_Manager* act_mgr = 0;
          LOOKUP_MANAGER->resolve (act_mgr);
@@ -80,7 +90,6 @@ TAO_NS_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
          }
 
          consumer->init_state (arg_shifter);
-         consumer->TAO_Notify_StructuredPushConsumer::name (this->name_);
 
         } /* -Create */
       else if (arg_shifter.cur_arg_strncasecmp ("-Subscription") == 0) // -Subscription admin_name +added_type1 +-added_type2 ... -added_type3 -added_type4..
@@ -163,8 +172,7 @@ TAO_NS_Periodic_Consumer_Command::consumer (void)
 void
 TAO_NS_Periodic_Consumer_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
 {
-  CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr proxy = this->consumer ()->get_proxy_supplier ();
-  proxy->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
+  this->consumer ()->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -172,48 +180,11 @@ void
 TAO_NS_Periodic_Consumer_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_NS_Periodic_Consumer* consumer = this->consumer ();
+
   if (consumer == 0)
     return;
 
-  // Get the POA
-  PortableServer::POA_var poa;
-  LOOKUP_MANAGER->resolve (poa, this->poa_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // set the POA
-  consumer->TAO_Notify_StructuredPushConsumer::init (poa.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Resolve the consumer admin
-  CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin;
-
-  LOOKUP_MANAGER->resolve (consumer_admin, this->admin_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  NotifyExt::ConsumerAdmin_var consumer_admin_ext;
-  consumer_admin_ext = NotifyExt::ConsumerAdmin::_narrow (consumer_admin.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // create the proxy supplier
-  CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier =
-    consumer_admin_ext->obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::STRUCTURED_EVENT
-                                                           , this->id_, this->qos_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ()));
-
-  CosNotifyChannelAdmin::StructuredProxyPushSupplier_var s_proxy_supplier =
-    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (proxy_supplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_ASSERT (!CORBA::is_nil (s_proxy_supplier.in ()));
-
-  // connect consumer to proxy, also activates the consumer as CORBA object in the POA specified.
-  consumer->connect (s_proxy_supplier.in (),this->id_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Register the proxy supplier.
-  LOOKUP_MANAGER->_register (s_proxy_supplier.in (), consumer->proxy_name () ACE_ENV_ARG_PARAMETER);
+  consumer->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "Consumer %s is connected\n", this->name_.c_str ()));
@@ -255,42 +226,13 @@ TAO_NS_Periodic_Consumer_Command::handle_deactivate (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_NS_Periodic_Consumer_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL)
 {
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
   TAO_NS_Periodic_Consumer* consumer = this->consumer ();
 
   if (consumer == 0)
     return;
 
-  ACE_TRY
-    {
-      CORBA::Boolean not_exist = consumer->get_proxy_supplier ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (not_exist == 1)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Consumer %s, Proxy does not exist\n",this->name_.c_str ()));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "Consumer %s, Proxy exists\n",this->name_.c_str ()));
-        }
-    }
-  ACE_CATCH(CORBA::TRANSIENT, ex)
-    {
-      ACE_PRINT_EXCEPTION (ex, "");
-      ACE_DEBUG ((LM_DEBUG, "Consumer %s is_equivanent transient exception.", this->name_.c_str ()));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
-      ACE_DEBUG ((LM_DEBUG, "Consumeris_equivanent other exception.", this->name_.c_str ()));
-    }
-  ACE_ENDTRY;
-
-#else
-  return;
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  consumer->status (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index 71e093c0b65..69376f5f7a1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -39,6 +39,7 @@ public:
 
   /// Destructor
   ~TAO_NS_Periodic_Consumer_Command ();
+
   /// Parse args and populate options.
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
@@ -67,16 +68,10 @@ protected:
     DUMP_STATE
   };
 
+  /// My name.
   ACE_CString name_;
 
-  ACE_CString admin_;
-
-  ACE_CString poa_;
-
-  CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_;
-
-  CosNotifyChannelAdmin::ProxyID id_;
-
+  /// QoS
   CosNotification::QoSProperties qos_;
 
   // Subscription change
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index 5cd81276a43..72bfaea9d9a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -16,14 +16,16 @@
 ACE_RCSID(RT_Notify, TAO_NS_Periodic_Supplier, "$id$")
 
 TAO_NS_Periodic_Supplier::TAO_NS_Periodic_Supplier (void)
-  :barrier_ (0),
-   priority_ (0),
-   period_ (0),
-   exec_time_ (0),
-   phase_ (0),
-   iter_ (0),
-   load_ (0),
-   client_ (0)
+  : barrier_ (0),
+    priority_ (0),
+    period_ (0),
+    total_deadlines_missed_ (0),
+    run_time_ (0),
+    exec_time_ (0),
+    phase_ (0),
+    iter_ (0),
+    load_ (0),
+    client_ (0)
 {
 }
 
@@ -38,41 +40,21 @@ TAO_NS_Periodic_Supplier::task_callback(TAO_NS_Task_Callback* client)
   this->client_ = client;
 }
 
-const char*
-TAO_NS_Periodic_Supplier::proxy_name (void)
-{
-  return this->proxy_name_.c_str ();
-}
-
-void
-TAO_NS_Periodic_Supplier::connect (CosNotifyChannelAdmin::StructuredProxyPushConsumer_ptr proxy, CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
-{
-  TAO_Notify_StructuredPushSupplier::connect (proxy, proxy_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_NS_Periodic_Supplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL)
-{
-  TAO_Notify_StructuredPushSupplier::connect (supplier_admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
 int
 TAO_NS_Periodic_Supplier::init_state (ACE_Arg_Shifter& arg_shifter)
 {
+  // First, let the base class look for options.
+  if (TAO_Notify_StructuredPushSupplier::init_state (arg_shifter) == -1)
+    return -1;
+
   const ACE_TCHAR *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter ("-Proxy")))
-        {
-          proxy_name_ = current_arg;
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-EventType")))
+      if ((current_arg = arg_shifter.get_the_parameter ("-EventType")))
         {
           this->event_.type ("*", current_arg) ;
+          zeroth_event.type ("*", current_arg) ;
           arg_shifter.consume_arg ();
         }
       else if (arg_shifter.cur_arg_strncasecmp ("-FilterLongData") == 0) // -FilterLongData name value
@@ -129,6 +111,11 @@ TAO_NS_Periodic_Supplier::init_state (ACE_Arg_Shifter& arg_shifter)
           load_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
+      else if ((current_arg = arg_shifter.get_the_parameter ("-RunTime"))) // in seconds
+        {
+          run_time_ = ACE_OS::atoi (current_arg);
+          arg_shifter.consume_arg ();
+        }
       else
         {
           ACE_DEBUG ((LM_DEBUG, "parse Task unknown option %s\n",
@@ -154,8 +141,7 @@ TAO_NS_Periodic_Supplier::activate_task (ACE_Barrier* barrier)
   LOOKUP_MANAGER->resolve (orb);
 
   flags |=
-    orb->orb_core ()->orb_params ()->sched_policy () |
-    orb->orb_core ()->orb_params ()->scope_policy ();
+    orb->orb_core ()->orb_params ()->thread_creation_flags ();
 
   TAO_NS_Priority_Mapping* priority_mapping;
   LOOKUP_MANAGER->resolve (priority_mapping);
@@ -187,25 +173,21 @@ TAO_NS_Periodic_Supplier::activate_task (ACE_Barrier* barrier)
   return 0;
 }
 
-int
-TAO_NS_Periodic_Supplier::svc (void)
+void
+TAO_NS_Periodic_Supplier::send_warmup_events (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Thread_Task (%t) - wait\n"));
+  int WARMUP_COUNT = 10;
 
-  // First, wait for other threads.
-  this->barrier_->wait ();
-
-  // first thread here inits the Base_Time.
-  stats_.base_time (BASE_TIME::instance ()->base_time_);
-
-  // now wait till the phase_ period expires.
-  ACE_OS::sleep (ACE_Time_Value (0, phase_));
-
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-
-  ACE_hrtime_t before, after;
+  for (int i = 0; i < WARMUP_COUNT ; ++i)
+    {
+      this->send_event (this->event_.event () ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+}
 
+void
+TAO_NS_Periodic_Supplier::send_prologue (ACE_ENV_SINGLE_ARG_DECL)
+{
   // populate event.
   // send the base time and max count.
   TimeBase::TimeT base_time;
@@ -214,53 +196,61 @@ TAO_NS_Periodic_Supplier::svc (void)
 
   CORBA::Any buffer;
   buffer <<= base_time;
-  this->event_.opt_header ("BaseTime", buffer);
+  zeroth_event.opt_header ("BaseTime", buffer);
 
   buffer <<= this->iter_;
-  this->event_.opt_header ("MaxCount", buffer);
+  zeroth_event.opt_header ("MaxCount", buffer);
+
+  buffer <<= this->load_;
+  zeroth_event.opt_header ("Load", buffer);
+
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG, "(%P, %t) Supplier (%s) sending event 0th event\n"));
+
+  this->send_event (zeroth_event.event () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_NS_Periodic_Supplier::handle_svc (ACE_ENV_SINGLE_ARG_DECL)
+{
+  this->send_prologue (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  ACE_hrtime_t before, after;
+  TimeBase::TimeT time_t;
+
+  CORBA::Any buffer;
+
+  ACE_hrtime_t base_time = BASE_TIME::instance ()->base_time_;
 
   for (int i = 0; i < iter_ ; ++i)
     {
       before = ACE_OS::gethrtime ();
 
-      ORBSVCS_Time::hrtime_to_TimeT (base_time,
+      ORBSVCS_Time::hrtime_to_TimeT (time_t,
                                      before);
 
-      CORBA::Any buffer;
-      buffer <<= base_time;
+      buffer <<= time_t;
 
       this->event_.payload (buffer);
 
-      ACE_TRY_NEW_ENV
+      if (this->run_time_ != 0 &&
+          Task_Stats::diff_sec (base_time, before) > this->run_time_)
         {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG, "(%P, %t) Supplier (%s) sending event #%d\n",
-                        this->proxy_name_.c_str (), i));
+          // Time up, send a "Stop" event.
+          buffer <<= (CORBA::Long) 1;
+          this->event_.opt_header ("Stop", buffer);
 
-          this->send_event (this->event_.event () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH (CORBA::UserException, ue)
-        {
-          ACE_PRINT_EXCEPTION (ue,
-                               "Periodic supplier: error sending event. ");
-          break;
-        }
-      ACE_CATCH (CORBA::SystemException, se)
-        {
-          ACE_PRINT_EXCEPTION (se,
-                               "Periodic supplier: error sending event. ");
-          break;
+          i = iter_;  // Load the iter so that the loop exits.
         }
-      ACE_ENDTRY;
 
-      /*ACE_CATCHANY
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG, "Periodic supplier: error sending event %s\n"));
-          break;
-        }
-      ACE_ENDTRY;*/
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG, "(%P, %t) Supplier (%s) sending event #%d\n",
+                    this->name_.c_str (), i));
+
+      this->send_event (this->event_.event () ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
       after = ACE_OS::gethrtime ();
 
@@ -268,83 +258,93 @@ TAO_NS_Periodic_Supplier::svc (void)
 
       if (period_ != 0) // blast mode, no sleep.
         {
-          // convert to microseconds
-#if !defined ACE_LACKS_LONGLONG_T
-
-          ACE_UINT32 elapsed_microseconds = ACE_UINT32((after - before) / gsf);
-
-#else  /* ! ACE_LACKS_LONGLONG_T */
-
-          ACE_UINT32 elapsed_microseconds = (after - before) / gsf;
-
-#endif /* ! ACE_LACKS_LONGLONG_T */
-
-#if defined (ACE_WIN32)
-          elapsed_microseconds*=1000; // convert to uSec on Win32
-#endif /* ACE_WIN32 */
-
-      // did we miss any deadlines?
+          ACE_UINT32 elapsed_microseconds =
+            Task_Stats::diff_usec (before, after);
 
+          // did we miss any deadlines?
           int missed =
             (int)elapsed_microseconds > period_ ? elapsed_microseconds/period_ : 0;
+          this->total_deadlines_missed_ += missed;
+
+          /* Start -- "Immediate run if last call missed deadline" */
+          if (missed > 0) // if we missed
+            continue;
+
+          long sleep_time = period_ - elapsed_microseconds;
+          /* End -- "Immediate run if last call missed deadline" */
 
-          long sleep_time = (missed + 1)*period_ ;
-          sleep_time -= elapsed_microseconds;
+          /*
+           * This logic sleeps till the next period.
+           * So, if we missed a deadline we wait.
+           *
+             long sleep_time = (missed + 1)*period_ ;
+             sleep_time -= elapsed_microseconds;
+          */
 
           if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG, "(%t) sleep time = %d\n", sleep_time));
+            ACE_DEBUG ((LM_DEBUG, "(%t) sleep time = %d uSec, missed %d deadlines\n", sleep_time, missed));
 
           ACE_Time_Value t_sleep (0, sleep_time);
           ACE_OS::sleep (t_sleep);
         } /* period != 0 */
+
     } /* for */
 
   stats_.end_time (ACE_OS::gethrtime ());
 
   if (this->client_)
     this->client_->done (this);
-
-  return 0;
 }
 
-void
-TAO_NS_Periodic_Supplier::dump_stats (ACE_TCHAR* msg)
+int
+TAO_NS_Periodic_Supplier::svc (void)
 {
-  char buf[BUFSIZ];
-  //@@ supplier name is not printing!
-  ACE_OS::sprintf (buf, "Supplier_%s_%d_%s.dat", this->name_.c_str (), this->proxy_consumer_id_, this->event_.type ());
-
-  ACE_CString fname (buf);
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG, "Thread_Task (%t) - wait\n"));
 
-  ACE_OS::sprintf (buf,"(%s) : Supplier Name = %s, Proxy ID = %d, Event Type = %s, priority %d, period %ld, exec_time %ld, phase %ld, iter_ %d , load_ %d",
-                   msg, this->name_.c_str (), this->proxy_consumer_id_, this->event_.type (), priority_, period_, exec_time_, phase_, iter_, load_);
+  ACE_TRY_NEW_ENV
+    {
+      // First, send warmup events.
+      this->send_warmup_events (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-  stats_.dump_samples (fname.c_str (), buf,
-                             ACE_High_Res_Timer::global_scale_factor ());
-}
+      // Next, wait for other threads.
+      this->barrier_->wait ();
 
-void
-TAO_NS_Periodic_Supplier::offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL)
-{
-  // Let the user see what we're subscribed for,
-  ACE_DEBUG ((LM_DEBUG, "(%P, %t) Calling Supplier offer change: \n"));
+      // first thread here inits the Base_Time.
+      stats_.base_time (BASE_TIME::instance ()->base_time_);
 
-  CORBA::ULong i = 0;
+      // now wait till the phase_ period expires.
+      ACE_OS::sleep (ACE_Time_Value (0, phase_));
 
-  for (; i < added.length (); ++i)
+      this->handle_svc (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CORBA::UserException, ue)
     {
-      ACE_DEBUG ((LM_DEBUG, "+(%s,%s), ", added[i].domain_name.in (), added[i].type_name.in ()));
+      ACE_PRINT_EXCEPTION (ue,
+                           "Periodic supplier: error sending event. ");
     }
-  for (i = 0; i < removed.length (); ++i)
+  ACE_CATCH (CORBA::SystemException, se)
     {
-      ACE_DEBUG ((LM_DEBUG, "-(%s,%s), ", removed[i].domain_name.in (), removed[i].type_name.in ()));
+      ACE_PRINT_EXCEPTION (se,
+                           "Periodic supplier: error sending event. ");
     }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+void
+TAO_NS_Periodic_Supplier::dump_stats (ACE_TCHAR* msg)
+{
+  char buf[BUFSIZ];
+  ACE_OS::sprintf (buf, "%s.dat", this->name_.c_str ());
 
-  ACE_DEBUG ((LM_DEBUG, "\n"));
+  ACE_CString fname (buf);
 
-  /// subscribe
-  CosNotifyChannelAdmin::StructuredProxyPushConsumer_ptr proxy_consumer = this->get_proxy_consumer ();
+  ACE_OS::sprintf (buf,"%s# : Supplier Name = %s, Proxy ID = %d, Event Type = %s, priority %d, period %ld, exec_time %ld, phase %ld, iter_ %d , load_ %d, deadlines missed = %d\n",
+                   msg, this->name_.c_str (), this->proxy_id_, this->event_.type (), priority_, period_, exec_time_, phase_, iter_, load_, this->total_deadlines_missed_);
 
-  proxy_consumer->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  stats_.dump_samples (fname.c_str (), buf);
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index 27e0a8c46a3..11aa675f0f7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*- */
 /**
- *  @file Periodic_Supplier.h
+ *  @file NS_Periodic_Supplier.h
  *
  *  $Id$
  *
@@ -52,27 +52,25 @@ public:
   /// Activate this task, synch on the given barrier.
   virtual int activate_task (ACE_Barrier* barrier);
 
-  /// Connect.
-  void connect (CosNotifyChannelAdmin::StructuredProxyPushConsumer_ptr proxy, CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL);
-
-  /// Connect.
-  virtual void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL);
-
   /// task svc
   virtual int svc (void);
 
   /// Dump stats.
   void dump_stats (ACE_TCHAR* msg);
 
-  /// Offer change.
-  void offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL);
-
   /// Get the name of the proxy
   const char* proxy_name (void);
 
 protected:
-  /// The name of the proxy we connect to.
-  ACE_CString proxy_name_;
+
+  /// svc method.
+  void handle_svc (ACE_ENV_SINGLE_ARG_DECL);
+
+  /// Send a few events before the actual measurements.
+  void send_warmup_events (ACE_ENV_SINGLE_ARG_DECL);
+
+  /// Send Prologue
+  void send_prologue (ACE_ENV_SINGLE_ARG_DECL);
 
   /// All tasks synch at this barrier.
   ACE_Barrier* barrier_;
@@ -80,12 +78,20 @@ protected:
   /// The event to send.
   TAO_NS_StructuredEvent event_;
 
+  TAO_NS_StructuredEvent zeroth_event;
+
   /// The priority of this task.
   CORBA::Short priority_;
 
   /// Period
   long period_;
 
+  /// Counts the total number of deadlines missed.
+  int total_deadlines_missed_;
+
+  /// RunTime - The Max. time to run the supplier.
+  long run_time_;
+
   /// Worst case exec. time.
   unsigned long exec_time_;
 
@@ -96,7 +102,7 @@ protected:
   int iter_;
 
   /// A load factor supplied to each Job.
-  int load_;
+  CORBA::ULong load_;
 
   /// Stats house keeping
   Task_Stats stats_;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index cbbadabd956..041e69f4637 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -7,12 +7,12 @@ ACE_RCSID(lib, TAO_Periodic_Supplier_Command, "$id$")
 #include "LookupManager.h"
 #include "Name.h"
 #include "Periodic_Supplier.h"
+#include "Direct_Supplier.h"
 #include "Activation_Manager.h"
 #include "Options_Parser.h"
 #include "orbsvcs/NotifyExtC.h"
 
 TAO_NS_Periodic_Supplier_Command::TAO_NS_Periodic_Supplier_Command (void)
-: poa_ (TAO_NS_Name::root_poa), ifgop_ (CosNotifyChannelAdmin::OR_OP), id_ (0)
 {
 }
 
@@ -47,38 +47,39 @@ TAO_NS_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter)
           this->name_ = arg_shifter.get_current ();
           arg_shifter.consume_arg ();
 
-          this->admin_ = arg_shifter.get_current ();
-          arg_shifter.consume_arg ();
+          int is_direct = 0;
+          ACE_CString direct_target;
 
-          // Is a POA name specified?
-         if (arg_shifter.cur_arg_strncasecmp ("-POA") == 0)
-           {
-             arg_shifter.consume_arg ();
+          if (arg_shifter.cur_arg_strncasecmp ("-Direct") == 0)
+            {
+              is_direct = 1;
 
-             this->name_ = arg_shifter.get_current ();
-             arg_shifter.consume_arg ();
-           }
+              arg_shifter.consume_arg ();
 
-         if (arg_shifter.cur_arg_strncasecmp ("-Set_QoS") == 0) // -Set_QoS [Qos Options]
-           {
-             arg_shifter.consume_arg ();
+              direct_target = arg_shifter.get_current ();
+              arg_shifter.consume_arg ();
+            }
 
-             TAO_NS_Options_Parser qos_parser;
-             qos_parser.execute (this->qos_, arg_shifter);
-           }
+          TAO_NS_Periodic_Supplier* supplier = 0;
 
-         // create the supplier
-         TAO_NS_Periodic_Supplier* supplier = new TAO_NS_Periodic_Supplier ();
+          // create the supplier
+          if (is_direct == 1)
+            supplier = new TAO_NS_Direct_Supplier (direct_target);
+          else
+            supplier = new TAO_NS_Periodic_Supplier ();
 
-         supplier->init_state (arg_shifter);
-         supplier->TAO_Notify_StructuredPushSupplier::name (this->name_);
+          supplier->set_name (this->name_);
 
          TAO_NS_Activation_Manager* act_mgr = 0;
          LOOKUP_MANAGER->resolve (act_mgr);
 
-         ACE_DECLARE_NEW_CORBA_ENV;
-         act_mgr->_register (supplier, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-         ACE_CHECK;
+         {
+           ACE_DECLARE_NEW_CORBA_ENV;
+           act_mgr->_register (supplier, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
+           ACE_CHECK;
+         }
+
+         supplier->init_state (arg_shifter);
         } /* -Create */
       else if (arg_shifter.cur_arg_strncasecmp ("-Offer") == 0) // -Offer supplier_name +added_type1 +-added_type2 ... -added_type3 -added_type4..
         {
@@ -161,44 +162,7 @@ TAO_NS_Periodic_Supplier_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
   if (supplier == 0)
     return;
 
-  // Get the POA
-  PortableServer::POA_var poa;
-  LOOKUP_MANAGER->resolve (poa);
-
-  // set the POA
-  supplier->TAO_Notify_StructuredPushSupplier::init (poa.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Resolve the supplier admin
-  CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin;
-
-  LOOKUP_MANAGER->resolve (supplier_admin, this->admin_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  NotifyExt::SupplierAdmin_var supplier_admin_ext;
-  supplier_admin_ext = NotifyExt::SupplierAdmin::_narrow (supplier_admin.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // create the proxy consumer
-  CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer =
-    supplier_admin_ext->obtain_notification_push_consumer_with_qos (CosNotifyChannelAdmin::STRUCTURED_EVENT
-                                                                , this->id_, this->qos_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ()));
-
-  CosNotifyChannelAdmin::StructuredProxyPushConsumer_var s_proxy_consumer =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxy_consumer.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_ASSERT (!CORBA::is_nil (s_proxy_consumer.in ()));
-
-      // connect supplier to proxy, also activates the Supplier as CORBA object in the POA specified.
-  supplier->connect (s_proxy_consumer.in (),this->id_  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-      // Register the proxy consumer.
-  LOOKUP_MANAGER->_register (s_proxy_consumer.in (), supplier->proxy_name () ACE_ENV_ARG_PARAMETER);
+  supplier->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "Supplier %s is connected\n", this->name_.c_str ()));
@@ -240,49 +204,23 @@ TAO_NS_Periodic_Supplier_Command::handle_deactivate (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_NS_Periodic_Supplier_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL)
 {
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
   TAO_NS_Periodic_Supplier* supplier = this->supplier ();
 
   if (supplier == 0)
     return;
 
-  ACE_TRY
-    {
-      CORBA::Boolean not_exist = supplier->get_proxy_consumer ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (not_exist == 1)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Supplier %s, Proxy does not exist\n",this->name_.c_str ()));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "Supplier %s, Proxy exists\n",this->name_.c_str ()));
-        }
-    }
-  ACE_CATCH(CORBA::TRANSIENT, ex)
-    {
-      ACE_PRINT_EXCEPTION (ex, "");
-      ACE_DEBUG ((LM_DEBUG, "Supplier %s is_equivanent transient exception.", this->name_.c_str ()));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
-      ACE_DEBUG ((LM_DEBUG, "Supplieris_equivanent other exception.", this->name_.c_str ()));
-    }
-  ACE_ENDTRY;
-#else
-  return;
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  supplier->status (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_NS_Periodic_Supplier_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
 {
-  CosNotifyChannelAdmin::StructuredProxyPushConsumer_ptr proxy = this->supplier ()->get_proxy_consumer ();
-  proxy->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_NS_Periodic_Supplier* supplier = this->supplier ();
+
+  if (supplier == 0)
+    return;
+
+  supplier->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index af2a9f77a15..7830c6d884d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -68,16 +68,10 @@ protected:
     DUMP_STATE
   };
 
+  /// My name.
   ACE_CString name_;
 
-  ACE_CString admin_;
-
-  ACE_CString poa_;
-
-  CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_;
-
-  CosNotifyChannelAdmin::ProxyID id_;
-
+  /// QoS
   CosNotification::QoSProperties qos_;
 
   // Offer change
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
new file mode 100644
index 00000000000..ead6d07fbe9
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
@@ -0,0 +1,65 @@
+// $Id$
+
+#include "PushConsumer.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "PushConsumer.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(lib, TAO_PushConsumer, "$id$")
+
+TAO_NS_PushConsumer_Traits::TAO_NS_PushConsumer_Traits (void)
+  :type_ (CosNotifyChannelAdmin::ANY_EVENT)
+{
+}
+
+/*******************************************************************/
+
+TAO_NS_PushConsumer::TAO_NS_PushConsumer (void)
+{
+}
+
+TAO_NS_PushConsumer::~TAO_NS_PushConsumer ()
+{
+}
+
+void
+TAO_NS_PushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+{
+  proxy_ptr->connect_any_push_consumer (peer_ptr ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_NS_PushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+{
+  this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+void
+TAO_NS_PushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+void
+TAO_NS_PushConsumer::push (const CORBA::Any & /*data*/ ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((
+                   CORBA::SystemException,
+                   CosEventComm::Disconnected
+                   ))
+{
+  // NOP
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO_NS_Peer_T<TAO_NS_PushConsumer_Traits>;
+template class TAO_NS_Consumer_T<TAO_NS_PushConsumer_Traits>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_NS_Peer_T<TAO_NS_PushConsumer_Traits>
+#pragma instantiate TAO_NS_Consumer_T<TAO_NS_PushConsumer_Traits>
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
new file mode 100644
index 00000000000..c60235ae870
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
@@ -0,0 +1,104 @@
+/* -*- C++ -*- */
+/**
+ *  @file PushConsumer.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_PUSHCONSUMER_H
+#define TAO_NS_PUSHCONSUMER_H
+#include "ace/pre.h"
+
+#include "notify_test_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
+
+#include "Consumer_T.h"
+
+class TAO_NS_ProxyPushSupplier_Traits
+{
+public:
+  typedef CosNotifyChannelAdmin::ProxyPushSupplier INTERFACE;
+  typedef CosNotifyChannelAdmin::ProxyPushSupplier_ptr PTR;
+  typedef CosNotifyChannelAdmin::ProxyPushSupplier_var VAR;
+  typedef CosNotifyChannelAdmin::ProxyID ID;
+};
+
+class TAO_NS_PushConsumer_Traits
+{
+public:
+  TAO_NS_PushConsumer_Traits (void);
+
+  typedef CosNotifyComm::PushConsumer INTERFACE;
+  typedef CosNotifyComm::PushConsumer_ptr PTR;
+  typedef CosNotifyComm::PushConsumer_var VAR;
+  typedef POA_CosNotifyComm::PushConsumer SKELETON;
+
+  typedef TAO_NS_ProxyPushSupplier_Traits Proxy_Traits;
+  typedef TAO_NS_ConsumerAdmin_Traits Admin_Traits;
+  typedef TAO_NS_ConsumerAdmin_Ext_Traits Admin_Ext_Traits;
+
+  const CosNotifyChannelAdmin::ClientType type_;
+};
+
+typedef TAO_NS_Consumer_T<TAO_NS_PushConsumer_Traits> TAO_NS_PushConsumer_Base;
+
+/**
+ * @class TAO_NS_PushConsumer
+ *
+ * @brief
+ *
+ */
+class TAO_NOTIFY_TEST_Export TAO_NS_PushConsumer : public TAO_NS_PushConsumer_Base
+{
+  typedef TAO_NS_PushConsumer_Traits Peer_Traits;
+  typedef Peer_Traits::Admin_Traits Admin_Traits;
+  typedef Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
+  typedef Peer_Traits::Proxy_Traits Proxy_Traits;
+
+public:
+  /// Constuctor
+  TAO_NS_PushConsumer (void);
+
+  /// Destructor
+  virtual ~TAO_NS_PushConsumer ();
+
+protected:
+  /// Connect to Peer.
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+
+  /// Disconnect from proxy.
+  virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+
+  // = PushConsumer methods
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
+
+ /// Default does nothing.
+    void push (
+        const CORBA::Any & data
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        CosEventComm::Disconnected
+      ));
+};
+
+#if defined (__ACE_INLINE__)
+#include "PushConsumer.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /* TAO_NS_PUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.inl b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.inl
new file mode 100644
index 00000000000..e557d6a7eda
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.inl
@@ -0,0 +1,3 @@
+// $Id$
+
+#include "PushConsumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
new file mode 100644
index 00000000000..cfd81bde610
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
@@ -0,0 +1,64 @@
+// $Id$
+
+#include "PushSupplier.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "PushSupplier.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(lib, TAO_PushSupplier, "$id$")
+
+TAO_NS_PushSupplier_Traits::TAO_NS_PushSupplier_Traits (void)
+  :type_ (CosNotifyChannelAdmin::ANY_EVENT)
+{
+}
+
+/*******************************************************************/
+
+TAO_NS_PushSupplier::TAO_NS_PushSupplier (void)
+{
+}
+
+TAO_NS_PushSupplier::~TAO_NS_PushSupplier ()
+{
+}
+
+void
+TAO_NS_PushSupplier::send_event (const CORBA::Any& any ACE_ENV_ARG_DECL)
+{
+  ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
+
+  this->proxy_->push (any ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_NS_PushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+{
+  proxy_ptr->connect_any_push_supplier (peer_ptr
+                                        ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_NS_PushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+{
+  this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+void
+TAO_NS_PushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO_NS_Peer_T<TAO_NS_PushSupplier_Traits>;
+template class TAO_NS_Supplier_T<TAO_NS_PushSupplier_Traits>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_NS_Peer_T<TAO_NS_PushSupplier_Traits>
+#pragma instantiate TAO_NS_Supplier_T<TAO_NS_PushSupplier_Traits>
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
new file mode 100644
index 00000000000..2237aa3fa37
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
@@ -0,0 +1,97 @@
+/* -*- C++ -*- */
+/**
+ *  @file PushSupplier.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_PUSHSUPPLIER_H
+#define TAO_NS_PUSHSUPPLIER_H
+#include "ace/pre.h"
+
+#include "notify_test_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
+
+#include "Supplier_T.h"
+
+class TAO_NS_ProxyPushConsumer_Traits
+{
+public:
+  typedef CosNotifyChannelAdmin::ProxyPushConsumer INTERFACE;
+  typedef CosNotifyChannelAdmin::ProxyPushConsumer_ptr PTR;
+  typedef CosNotifyChannelAdmin::ProxyPushConsumer_var VAR;
+  typedef CosNotifyChannelAdmin::ProxyID ID;
+};
+
+class TAO_NS_PushSupplier_Traits
+{
+public:
+  TAO_NS_PushSupplier_Traits (void);
+
+  typedef CosNotifyComm::PushSupplier INTERFACE;
+  typedef CosNotifyComm::PushSupplier_ptr PTR;
+  typedef CosNotifyComm::PushSupplier_var VAR;
+  typedef POA_CosNotifyComm::PushSupplier SKELETON;
+
+  typedef TAO_NS_ProxyPushConsumer_Traits Proxy_Traits;
+  typedef TAO_NS_SupplierAdmin_Traits Admin_Traits;
+  typedef TAO_NS_SupplierAdmin_Ext_Traits Admin_Ext_Traits;
+
+  const CosNotifyChannelAdmin::ClientType type_;
+};
+
+typedef TAO_NS_Supplier_T<TAO_NS_PushSupplier_Traits> TAO_NS_PushSupplier_Base;
+
+/**
+ * @class TAO_NS_PushSupplier
+ *
+ * @brief
+ *
+ */
+class TAO_NOTIFY_TEST_Export TAO_NS_PushSupplier : public TAO_NS_PushSupplier_Base
+{
+  typedef TAO_NS_PushSupplier_Traits Peer_Traits;
+  typedef Peer_Traits::Admin_Traits Admin_Traits;
+  typedef Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
+  typedef Peer_Traits::Proxy_Traits Proxy_Traits;
+
+public:
+  /// Constuctor
+  TAO_NS_PushSupplier (void);
+
+  /// Destructor
+  virtual ~TAO_NS_PushSupplier ();
+
+  /// Send one event.
+  virtual void send_event (const CORBA::Any & data ACE_ENV_ARG_DECL);
+
+protected:
+  /// Connect to Peer.
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+
+  /// Disconnect from proxy.
+  virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+
+  // = PushSupplier method
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
+};
+
+#if defined (__ACE_INLINE__)
+#include "PushSupplier.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /* TAO_NS_PUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.inl b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.inl
new file mode 100644
index 00000000000..9f9bf75ff2f
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.inl
@@ -0,0 +1,3 @@
+// $Id$
+
+#include "PushSupplier.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
new file mode 100644
index 00000000000..584b8bcf049
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
@@ -0,0 +1,44 @@
+// $Id$
+
+#include "Relay_Consumer.h"
+
+ACE_RCSID(Notify, TAO_NS_Relay_Consumer, "$id$")
+
+#include "LookupManager.h"
+
+TAO_NS_Relay_Consumer::TAO_NS_Relay_Consumer (ACE_CString& destination)
+  : destination_ (destination)
+{
+}
+
+TAO_NS_Relay_Consumer::~TAO_NS_Relay_Consumer ()
+{
+}
+
+void
+TAO_NS_Relay_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+{
+  TAO_NS_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Resolve the destination object.
+  LOOKUP_MANAGER->resolve (this->destination_object_, this->destination_.c_str () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_NS_Relay_Consumer::push_structured_event (const CosNotification::StructuredEvent &notification
+                                              ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   CosEventComm::Disconnected))
+{
+  // The Periodic Consumer will record the run statistics.
+  TAO_NS_Periodic_Consumer::push_structured_event (notification ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Forward the event.
+  if (CORBA::is_nil (this->destination_object_.in ()))
+    ACE_DEBUG ((LM_DEBUG, "(%P,%t) Cannot Relay - Destination object %s is nil", this->destination_.c_str ()));
+  else
+    this->destination_object_->push_structured_event (notification ACE_ENV_ARG_PARAMETER);
+}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
new file mode 100644
index 00000000000..c85ae9f7326
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
@@ -0,0 +1,56 @@
+/* -*- C++ -*- */
+/**
+ *  @file Relay_Consumer.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_RELAY_CONSUMER_H
+#define TAO_NS_RELAY_CONSUMER_H
+#include "ace/pre.h"
+
+#include "notify_test_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Direct_Consumer.h"
+
+/**
+ * @class TAO_NS_Relay_Consumer
+ *
+ * @brief Relay events to a destination consumer.
+ *
+ */
+class TAO_NOTIFY_TEST_Export TAO_NS_Relay_Consumer : public TAO_NS_Direct_Consumer
+{
+public:
+  /// Constuctor
+  TAO_NS_Relay_Consumer (ACE_CString& destination);
+
+  /// Destructor
+  ~TAO_NS_Relay_Consumer ();
+
+  /// Connect using options parsed and set initial QoS.
+  virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
+
+  void push_structured_event (const CosNotification::StructuredEvent &/*notification*/
+                              ACE_ENV_ARG_DECL_NOT_USED)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     CosEventComm::Disconnected));
+
+protected:
+  /// Destination object.
+  ACE_CString destination_;
+
+  /// This object is resolved in the connect method.
+  CosNotifyComm::StructuredPushConsumer_var destination_object_;
+};
+
+#include "ace/post.h"
+#endif /* TAO_NS_RELAY_CONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.inl b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.inl
new file mode 100644
index 00000000000..d38d4639901
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.inl
@@ -0,0 +1,3 @@
+// $Id$
+
+#include "Relay_Consumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
new file mode 100644
index 00000000000..aef188a6e7b
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
@@ -0,0 +1,66 @@
+// $Id$
+
+#include "SequencePushConsumer.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "SequencePushConsumer.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(lib, TAO_SequencePushConsumer, "$id$")
+
+TAO_NS_SequencePushConsumer_Traits::TAO_NS_SequencePushConsumer_Traits (void)
+  :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
+{
+}
+
+/*******************************************************************/
+
+TAO_NS_SequencePushConsumer::TAO_NS_SequencePushConsumer (void)
+{
+}
+
+TAO_NS_SequencePushConsumer::~TAO_NS_SequencePushConsumer ()
+{
+}
+
+void
+TAO_NS_SequencePushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+{
+  proxy_ptr->connect_sequence_push_consumer (peer_ptr
+                                               ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_NS_SequencePushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+{
+  this->proxy_->disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+void
+TAO_NS_SequencePushConsumer::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+void
+TAO_NS_SequencePushConsumer::push_structured_events
+   (const CosNotification::EventBatch &/*notifications*/
+    ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   CosEventComm::Disconnected))
+{
+  // NOP
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO_NS_Peer_T<TAO_NS_SequencePushConsumer_Traits>;
+template class TAO_NS_Consumer_T<TAO_NS_SequencePushConsumer_Traits>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_NS_Peer_T<TAO_NS_SequencePushConsumer_Traits>
+#pragma instantiate TAO_NS_Consumer_T<TAO_NS_SequencePushConsumer_Traits>
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
new file mode 100644
index 00000000000..f34381db7eb
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
@@ -0,0 +1,104 @@
+/* -*- C++ -*- */
+/**
+ *  @file SequencePushConsumer.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_SEQUENCEPUSHCONSUMER_H
+#define TAO_NS_SEQUENCEPUSHCONSUMER_H
+#include "ace/pre.h"
+
+#include "notify_test_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
+
+#include "Consumer_T.h"
+
+class TAO_NS_SequenceProxyPushSupplier_Traits
+{
+public:
+  typedef CosNotifyChannelAdmin::SequenceProxyPushSupplier INTERFACE;
+  typedef CosNotifyChannelAdmin::SequenceProxyPushSupplier_ptr PTR;
+  typedef CosNotifyChannelAdmin::SequenceProxyPushSupplier_var VAR;
+  typedef CosNotifyChannelAdmin::ProxyID ID;
+};
+
+class TAO_NS_SequencePushConsumer_Traits
+{
+public:
+  TAO_NS_SequencePushConsumer_Traits (void);
+
+  typedef CosNotifyComm::SequencePushConsumer INTERFACE;
+  typedef CosNotifyComm::SequencePushConsumer_ptr PTR;
+  typedef CosNotifyComm::SequencePushConsumer_var VAR;
+  typedef POA_CosNotifyComm::SequencePushConsumer SKELETON;
+
+  typedef TAO_NS_SequenceProxyPushSupplier_Traits Proxy_Traits;
+  typedef TAO_NS_ConsumerAdmin_Traits Admin_Traits;
+  typedef TAO_NS_ConsumerAdmin_Ext_Traits Admin_Ext_Traits;
+
+  const CosNotifyChannelAdmin::ClientType type_;
+};
+
+typedef TAO_NS_Consumer_T<TAO_NS_SequencePushConsumer_Traits> TAO_NS_SequencePushConsumer_Base;
+
+/**
+ * @class TAO_NS_SequencePushConsumer
+ *
+ * @brief
+ *
+ */
+class TAO_NOTIFY_TEST_Export TAO_NS_SequencePushConsumer : public TAO_NS_SequencePushConsumer_Base
+{
+  typedef TAO_NS_SequencePushConsumer_Traits Peer_Traits;
+  typedef Peer_Traits::Admin_Traits Admin_Traits;
+  typedef Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
+  typedef Peer_Traits::Proxy_Traits Proxy_Traits;
+
+public:
+  /// Constuctor
+  TAO_NS_SequencePushConsumer (void);
+
+  /// Destructor
+  virtual ~TAO_NS_SequencePushConsumer ();
+
+protected:
+  /// Connect to Peer.
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+
+  /// Disconnect from proxy.
+  virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+
+  // = SequencePushConsumer methods
+  virtual void disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
+
+ /// Default does nothing.
+  virtual void push_structured_events (
+        const CosNotification::EventBatch & notifications
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        CosEventComm::Disconnected
+       ));
+};
+
+#if defined (__ACE_INLINE__)
+#include "SequencePushConsumer.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /* TAO_NS_SEQUENCEPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.inl b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.inl
new file mode 100644
index 00000000000..d050292323e
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.inl
@@ -0,0 +1,3 @@
+// $Id$
+
+#include "SequencePushConsumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
new file mode 100644
index 00000000000..4a8f32688d3
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
@@ -0,0 +1,67 @@
+// $Id$
+
+#include "SequencePushSupplier.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "SequencePushSupplier.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(lib, TAO_SequencePushSupplier, "$id$")
+
+TAO_NS_SequencePushSupplier_Traits::TAO_NS_SequencePushSupplier_Traits (void)
+  :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT)
+{
+}
+
+/*******************************************************************/
+
+TAO_NS_SequencePushSupplier::TAO_NS_SequencePushSupplier (void)
+{
+}
+
+TAO_NS_SequencePushSupplier::~TAO_NS_SequencePushSupplier ()
+{
+}
+
+void
+TAO_NS_SequencePushSupplier::send_events (const CosNotification::EventBatch& events
+                                          ACE_ENV_ARG_DECL
+                                          )
+{
+  ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
+
+  this->proxy_->push_structured_events (events ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_NS_SequencePushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+{
+  proxy_ptr->connect_sequence_push_supplier (peer_ptr
+                                               ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_NS_SequencePushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+{
+  this->proxy_->disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+void
+TAO_NS_SequencePushSupplier::disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO_NS_Peer_T<TAO_NS_SequencePushSupplier_Traits>;
+template class TAO_NS_Supplier_T<TAO_NS_SequencePushSupplier_Traits>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_NS_Peer_T<TAO_NS_SequencePushSupplier_Traits>
+#pragma instantiate TAO_NS_Supplier_T<TAO_NS_SequencePushSupplier_Traits>
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
new file mode 100644
index 00000000000..7a46c2a040d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
@@ -0,0 +1,98 @@
+/* -*- C++ -*- */
+/**
+ *  @file SequencePushSupplier.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_SEQUENCEPUSHSUPPLIER_H
+#define TAO_NS_SEQUENCEPUSHSUPPLIER_H
+#include "ace/pre.h"
+
+#include "notify_test_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
+
+#include "Supplier_T.h"
+
+class TAO_NS_SequenceProxyPushConsumer_Traits
+{
+public:
+  typedef CosNotifyChannelAdmin::SequenceProxyPushConsumer INTERFACE;
+  typedef CosNotifyChannelAdmin::SequenceProxyPushConsumer_ptr PTR;
+  typedef CosNotifyChannelAdmin::SequenceProxyPushConsumer_var VAR;
+  typedef CosNotifyChannelAdmin::ProxyID ID;
+};
+
+class TAO_NS_SequencePushSupplier_Traits
+{
+public:
+  TAO_NS_SequencePushSupplier_Traits (void);
+
+  typedef CosNotifyComm::SequencePushSupplier INTERFACE;
+  typedef CosNotifyComm::SequencePushSupplier_ptr PTR;
+  typedef CosNotifyComm::SequencePushSupplier_var VAR;
+  typedef POA_CosNotifyComm::SequencePushSupplier SKELETON;
+
+  typedef TAO_NS_SequenceProxyPushConsumer_Traits Proxy_Traits;
+  typedef TAO_NS_SupplierAdmin_Traits Admin_Traits;
+  typedef TAO_NS_SupplierAdmin_Ext_Traits Admin_Ext_Traits;
+
+  const CosNotifyChannelAdmin::ClientType type_;
+};
+
+typedef TAO_NS_Supplier_T<TAO_NS_SequencePushSupplier_Traits> TAO_NS_SequencePushSupplier_Base;
+
+/**
+ * @class TAO_NS_SequencePushSupplier
+ *
+ * @brief
+ *
+ */
+class TAO_NOTIFY_TEST_Export TAO_NS_SequencePushSupplier : public TAO_NS_SequencePushSupplier_Base
+{
+  typedef TAO_NS_SequencePushSupplier_Traits Peer_Traits;
+  typedef Peer_Traits::Admin_Traits Admin_Traits;
+  typedef Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
+  typedef Peer_Traits::Proxy_Traits Proxy_Traits;
+
+public:
+  /// Constuctor
+  TAO_NS_SequencePushSupplier (void);
+
+  /// Destructor
+  virtual ~TAO_NS_SequencePushSupplier ();
+
+  /// Send one event.
+  virtual void send_events (const CosNotification::EventBatch& events
+                            ACE_ENV_ARG_DECL);
+
+protected:
+  /// Connect to Peer.
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+
+  /// Disconnect from proxy.
+  virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+
+  // = SequencePushSupplier method
+  virtual void disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
+};
+
+#if defined (__ACE_INLINE__)
+#include "SequencePushSupplier.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /* TAO_NS_SEQUENCEPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.inl b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.inl
new file mode 100644
index 00000000000..507cd0b85c6
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.inl
@@ -0,0 +1,3 @@
+// $Id$
+
+#include "SequencePushSupplier.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
new file mode 100644
index 00000000000..10f85775fb3
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
@@ -0,0 +1,66 @@
+// $Id$
+
+#include "StructuredPushConsumer.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "StructuredPushConsumer.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(lib, TAO_StructuredPushConsumer, "$id$")
+
+TAO_NS_StructuredPushConsumer_Traits::TAO_NS_StructuredPushConsumer_Traits (void)
+  :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
+{
+}
+
+/*******************************************************************/
+
+TAO_NS_StructuredPushConsumer::TAO_NS_StructuredPushConsumer (void)
+{
+}
+
+TAO_NS_StructuredPushConsumer::~TAO_NS_StructuredPushConsumer ()
+{
+}
+
+void
+TAO_NS_StructuredPushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+{
+  proxy_ptr->connect_structured_push_consumer (peer_ptr
+                                               ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_NS_StructuredPushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+{
+  this->proxy_->disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+void
+TAO_NS_StructuredPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+void
+TAO_NS_StructuredPushConsumer::push_structured_event
+   (const CosNotification::StructuredEvent &/*notification*/
+    ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   CosEventComm::Disconnected))
+{
+  // NOP
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO_NS_Peer_T<TAO_NS_StructuredPushConsumer_Traits>;
+template class TAO_NS_Consumer_T<TAO_NS_StructuredPushConsumer_Traits>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_NS_Peer_T<TAO_NS_StructuredPushConsumer_Traits>
+#pragma instantiate TAO_NS_Consumer_T<TAO_NS_StructuredPushConsumer_Traits>
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
new file mode 100644
index 00000000000..63be5139b37
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
@@ -0,0 +1,104 @@
+/* -*- C++ -*- */
+/**
+ *  @file StructuredPushConsumer.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_STRUCTUREDPUSHCONSUMER_H
+#define TAO_NS_STRUCTUREDPUSHCONSUMER_H
+#include "ace/pre.h"
+
+#include "notify_test_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
+
+#include "Consumer_T.h"
+
+class TAO_NS_StructuredProxyPushSupplier_Traits
+{
+public:
+  typedef CosNotifyChannelAdmin::StructuredProxyPushSupplier INTERFACE;
+  typedef CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr PTR;
+  typedef CosNotifyChannelAdmin::StructuredProxyPushSupplier_var VAR;
+  typedef CosNotifyChannelAdmin::ProxyID ID;
+};
+
+class TAO_NS_StructuredPushConsumer_Traits
+{
+public:
+  TAO_NS_StructuredPushConsumer_Traits (void);
+
+  typedef CosNotifyComm::StructuredPushConsumer INTERFACE;
+  typedef CosNotifyComm::StructuredPushConsumer_ptr PTR;
+  typedef CosNotifyComm::StructuredPushConsumer_var VAR;
+  typedef POA_CosNotifyComm::StructuredPushConsumer SKELETON;
+
+  typedef TAO_NS_StructuredProxyPushSupplier_Traits Proxy_Traits;
+  typedef TAO_NS_ConsumerAdmin_Traits Admin_Traits;
+  typedef TAO_NS_ConsumerAdmin_Ext_Traits Admin_Ext_Traits;
+
+  const CosNotifyChannelAdmin::ClientType type_;
+};
+
+typedef TAO_NS_Consumer_T<TAO_NS_StructuredPushConsumer_Traits> TAO_NS_StructuredPushConsumer_Base;
+
+/**
+ * @class TAO_NS_StructuredPushConsumer
+ *
+ * @brief
+ *
+ */
+class TAO_NOTIFY_TEST_Export TAO_NS_StructuredPushConsumer : public TAO_NS_StructuredPushConsumer_Base
+{
+  typedef TAO_NS_StructuredPushConsumer_Traits Peer_Traits;
+  typedef Peer_Traits::Admin_Traits Admin_Traits;
+  typedef Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
+  typedef Peer_Traits::Proxy_Traits Proxy_Traits;
+
+public:
+  /// Constuctor
+  TAO_NS_StructuredPushConsumer (void);
+
+  /// Destructor
+  virtual ~TAO_NS_StructuredPushConsumer ();
+
+protected:
+  /// Connect to Peer.
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+
+  /// Disconnect from proxy.
+  virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+
+  // = StructuredPushConsumer methods
+  virtual void disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
+
+ /// Default does nothing.
+  virtual void push_structured_event (
+        const CosNotification::StructuredEvent & notification
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        CosEventComm::Disconnected
+       ));
+};
+
+#if defined (__ACE_INLINE__)
+#include "StructuredPushConsumer.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /* TAO_NS_STRUCTUREDPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.inl b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.inl
new file mode 100644
index 00000000000..24e952b7ae8
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.inl
@@ -0,0 +1,3 @@
+// $Id$
+
+#include "StructuredPushConsumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
new file mode 100644
index 00000000000..3aa8f990f7a
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
@@ -0,0 +1,67 @@
+// $Id$
+
+#include "StructuredPushSupplier.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "StructuredPushSupplier.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(lib, TAO_StructuredPushSupplier, "$id$")
+
+TAO_NS_StructuredPushSupplier_Traits::TAO_NS_StructuredPushSupplier_Traits (void)
+  :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT)
+{
+}
+
+/*******************************************************************/
+
+TAO_NS_StructuredPushSupplier::TAO_NS_StructuredPushSupplier (void)
+{
+}
+
+TAO_NS_StructuredPushSupplier::~TAO_NS_StructuredPushSupplier ()
+{
+}
+
+void
+TAO_NS_StructuredPushSupplier::send_event (
+    const CosNotification::StructuredEvent& event
+    ACE_ENV_ARG_DECL
+  )
+{
+  ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
+
+  this->proxy_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_NS_StructuredPushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+{
+  proxy_ptr->connect_structured_push_supplier (peer_ptr
+                                               ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_NS_StructuredPushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+{
+  this->proxy_->disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+void
+TAO_NS_StructuredPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO_NS_Peer_T<TAO_NS_StructuredPushSupplier_Traits>;
+template class TAO_NS_Supplier_T<TAO_NS_StructuredPushSupplier_Traits>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_NS_Peer_T<TAO_NS_StructuredPushSupplier_Traits>
+#pragma instantiate TAO_NS_Supplier_T<TAO_NS_StructuredPushSupplier_Traits>
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
new file mode 100644
index 00000000000..50698efbd0e
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
@@ -0,0 +1,98 @@
+/* -*- C++ -*- */
+/**
+ *  @file StructuredPushSupplier.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_STRUCTUREDPUSHSUPPLIER_H
+#define TAO_NS_STRUCTUREDPUSHSUPPLIER_H
+#include "ace/pre.h"
+
+#include "notify_test_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
+
+#include "Supplier_T.h"
+
+class TAO_NS_StructuredProxyPushConsumer_Traits
+{
+public:
+  typedef CosNotifyChannelAdmin::StructuredProxyPushConsumer INTERFACE;
+  typedef CosNotifyChannelAdmin::StructuredProxyPushConsumer_ptr PTR;
+  typedef CosNotifyChannelAdmin::StructuredProxyPushConsumer_var VAR;
+  typedef CosNotifyChannelAdmin::ProxyID ID;
+};
+
+class TAO_NS_StructuredPushSupplier_Traits
+{
+public:
+  TAO_NS_StructuredPushSupplier_Traits (void);
+
+  typedef CosNotifyComm::StructuredPushSupplier INTERFACE;
+  typedef CosNotifyComm::StructuredPushSupplier_ptr PTR;
+  typedef CosNotifyComm::StructuredPushSupplier_var VAR;
+  typedef POA_CosNotifyComm::StructuredPushSupplier SKELETON;
+
+  typedef TAO_NS_StructuredProxyPushConsumer_Traits Proxy_Traits;
+  typedef TAO_NS_SupplierAdmin_Traits Admin_Traits;
+  typedef TAO_NS_SupplierAdmin_Ext_Traits Admin_Ext_Traits;
+
+  const CosNotifyChannelAdmin::ClientType type_;
+};
+
+typedef TAO_NS_Supplier_T<TAO_NS_StructuredPushSupplier_Traits> TAO_NS_StructuredPushSupplier_Base;
+
+/**
+ * @class TAO_NS_StructuredPushSupplier
+ *
+ * @brief
+ *
+ */
+class TAO_NOTIFY_TEST_Export TAO_NS_StructuredPushSupplier : public TAO_NS_StructuredPushSupplier_Base
+{
+  typedef TAO_NS_StructuredPushSupplier_Traits Peer_Traits;
+  typedef Peer_Traits::Admin_Traits Admin_Traits;
+  typedef Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
+  typedef Peer_Traits::Proxy_Traits Proxy_Traits;
+
+public:
+  /// Constuctor
+  TAO_NS_StructuredPushSupplier (void);
+
+  /// Destructor
+  virtual ~TAO_NS_StructuredPushSupplier ();
+
+  /// Send one event.
+  virtual void send_event (const CosNotification::StructuredEvent& event
+                           ACE_ENV_ARG_DECL);
+
+protected:
+  /// Connect to Peer.
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+
+  /// Disconnect from proxy.
+  virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+
+  // = StructuredPushSupplier method
+  virtual void disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
+};
+
+#if defined (__ACE_INLINE__)
+#include "StructuredPushSupplier.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /* TAO_NS_STRUCTUREDPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.inl b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.inl
new file mode 100644
index 00000000000..12cb29daaef
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.inl
@@ -0,0 +1,3 @@
+// $Id$
+
+#include "StructuredPushSupplier.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
new file mode 100644
index 00000000000..7822661cab9
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -0,0 +1,108 @@
+// $Id$
+#ifndef TAO_NS_Supplier_T_CPP
+#define TAO_NS_Supplier_T_CPP
+
+#include "Supplier_T.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "Supplier_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(Notify, TAO_NS_Supplier_T, "$id$")
+
+template <class Supplier_Traits>
+TAO_NS_Supplier_T<Supplier_Traits>::TAO_NS_Supplier_T (void)
+{
+}
+
+template <class Supplier_Traits>
+TAO_NS_Supplier_T<Supplier_Traits>::~TAO_NS_Supplier_T ()
+{
+}
+
+template <class Supplier_Traits> TAO_NS_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
+TAO_NS_Supplier_T<Supplier_Traits>::get_proxy_consumer (void)
+{
+  return this->get_proxy ();
+}
+
+template <class Supplier_Traits> TAO_NS_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
+TAO_NS_Supplier_T<Supplier_Traits>::obtain_proxy (TAO_NS_Supplier_T<Supplier_Traits>::Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL)
+{
+  Supplier_Traits traits;
+
+  CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer =
+    admin_ptr->obtain_notification_push_consumer (traits.type_
+                                                  , this->proxy_id_
+                                                  ACE_ENV_ARG_PARAMETER
+                                                  );
+
+  ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ());
+
+  ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ()));
+
+  return Proxy_Traits_INTERFACE::_narrow (proxy_consumer.in ()
+  ACE_ENV_ARG_PARAMETER);
+}
+
+template <class Supplier_Traits> TAO_NS_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
+TAO_NS_Supplier_T<Supplier_Traits>::obtain_proxy (TAO_NS_Supplier_T<Supplier_Traits>::Admin_Ext_Traits_PTR admin_ptr
+                                             , CosNotification::QoSProperties& qos
+                                             ACE_ENV_ARG_DECL)
+{
+  Supplier_Traits traits;
+
+  // create the proxy consumer
+  CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer =
+    admin_ptr->obtain_notification_push_consumer_with_qos (traits.type_
+                                                           , this->proxy_id_
+                                                           , qos
+                                                           ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ());
+
+  ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ()));
+
+  return Proxy_Traits_INTERFACE::_narrow (proxy_consumer.in ()
+                                           ACE_ENV_ARG_PARAMETER);
+}
+
+template <class Supplier_Traits> void
+TAO_NS_Supplier_T<Supplier_Traits>::offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL)
+{
+  // Let the user see what we're subscribed for,
+  ACE_DEBUG ((LM_DEBUG, "(%P, %t) Calling Supplier offer change: \n"));
+
+  CORBA::ULong i = 0;
+
+  for (; i < added.length (); ++i)
+    {
+      ACE_DEBUG ((LM_DEBUG, "+(%s,%s), ", added[i].domain_name.in (), added[i].type_name.in ()));
+    }
+  for (i = 0; i < removed.length (); ++i)
+    {
+      ACE_DEBUG ((LM_DEBUG, "-(%s,%s), ", removed[i].domain_name.in (), removed[i].type_name.in ()));
+    }
+
+  ACE_DEBUG ((LM_DEBUG, "\n"));
+
+  /// subscribe
+  ACE_TYPENAME Proxy_Traits::PTR proxy_consumer = this->get_proxy ();
+
+  proxy_consumer->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+template <class Supplier_Traits> void
+TAO_NS_Supplier_T<Supplier_Traits>::subscription_change (
+                                                         const CosNotification::EventTypeSeq & /*added*/,
+                                                         const CosNotification::EventTypeSeq & /*removed*/
+        ACE_ENV_ARG_DECL_NOT_USED
+        )
+  ACE_THROW_SPEC ((
+                   CORBA::SystemException,
+                   CosNotifyComm::InvalidEventType
+                   ))
+{
+  // No op.
+}
+#endif /* TAO_NS_Supplier_T_CPP */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
new file mode 100644
index 00000000000..d90efc4a0ef
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
@@ -0,0 +1,105 @@
+/* -*- C++ -*- */
+/**
+ *  @file Supplier_T.h
+ *
+ *  $Id$
+ *
+ *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
+ */
+
+#ifndef TAO_NS_SUPPLIER_T_H
+#define TAO_NS_SUPPLIER_T_H
+#include "ace/pre.h"
+
+#include "notify_test_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Peer_T.h"
+
+class TAO_NS_SupplierAdmin_Traits
+{
+ public:
+  typedef CosNotifyChannelAdmin::SupplierAdmin INTERFACE;
+  typedef CosNotifyChannelAdmin::SupplierAdmin_ptr PTR;
+  typedef CosNotifyChannelAdmin::SupplierAdmin_var VAR;
+};
+
+class TAO_NS_SupplierAdmin_Ext_Traits
+{
+ public:
+  typedef NotifyExt::SupplierAdmin INTERFACE;
+  typedef NotifyExt::SupplierAdmin_ptr PTR;
+  typedef NotifyExt::SupplierAdmin_var VAR;
+};
+
+/**
+ * @class TAO_NS_Supplier_T
+ *
+ * @brief
+ *
+ */
+template <class Supplier_Traits>
+class TAO_NOTIFY_TEST_Export TAO_NS_Supplier_T : public TAO_NS_Peer_T <Supplier_Traits>
+{
+  typedef ACE_TYPENAME Supplier_Traits::Admin_Traits Admin_Traits;
+  typedef ACE_TYPENAME Supplier_Traits::Admin_Ext_Traits Admin_Ext_Traits;
+  typedef ACE_TYPENAME Supplier_Traits::Proxy_Traits Proxy_Traits;
+
+  typedef ACE_TYPENAME Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE;
+  typedef ACE_TYPENAME Proxy_Traits::PTR Proxy_Traits_PTR;
+  typedef ACE_TYPENAME Admin_Traits::PTR Admin_Traits_PTR;
+  typedef ACE_TYPENAME Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR;
+
+public:
+  /// Constuctor
+  TAO_NS_Supplier_T (void);
+
+  /// Destructor
+  ~TAO_NS_Supplier_T ();
+
+  /// For backward compatibility. use <get_proxy> instead.
+  Proxy_Traits_PTR get_proxy_consumer (void);
+
+  /// Send offer change.
+  void offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL);
+
+protected:
+  /// Obtain Proxy.
+  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL);
+
+  /// Obtain Proxy with QoS.
+  virtual Proxy_Traits_PTR obtain_proxy (Admin_Ext_Traits_PTR admin_ptr
+                                         , CosNotification::QoSProperties& qos
+                                          ACE_ENV_ARG_DECL);
+
+    // = NotifySubscribe
+    virtual void subscription_change (
+        const CosNotification::EventTypeSeq & added,
+        const CosNotification::EventTypeSeq & removed
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        CosNotifyComm::InvalidEventType
+      ));
+};
+
+#if defined (__ACE_INLINE__)
+#include "Supplier_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Supplier_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Supplier_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+#endif /* TAO_NS_SUPPLIER_T_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.inl b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.inl
new file mode 100644
index 00000000000..74e88caa0c5
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.inl
@@ -0,0 +1,2 @@
+// $Id$
+
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
index c5f9a395b5f..2c358345d97 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
@@ -1,4 +1,5 @@
 //$Id$
+
 #include "Task_Stats.h"
 #include "ace/OS.h"
 #include "ace/Log_Msg.h"
@@ -7,6 +8,9 @@
 #include "Task_Stats.inl"
 #endif /* __ACE_INLINE__ */
 
+ACE_UINT32 Task_Stats::gsf_
+= ACE_High_Res_Timer::global_scale_factor ();
+
 Base_Time::Base_Time (void)
 {
   base_time_ = ACE_OS::gethrtime ();
@@ -19,12 +23,8 @@ Task_Stats::Task_Stats (void)
     samples_count_ (0),
     time_inv_ (0),
     time_exec_ (0),
-    exec_time_min_ (0),
-    exec_time_min_at_ (0),
-    exec_time_max_ (0),
-    exec_time_max_at_(0),
-    sum_ (0),
-    sum2_ (0)
+    mean_ (0),
+    var_2_ (0)
 {
 }
 
@@ -57,8 +57,7 @@ Task_Stats::end_time (ACE_hrtime_t time)
 }
 
 void
-Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
-                          ACE_UINT32 scale_factor)
+Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg)
 {
   FILE* output_file = ACE_OS::fopen (file_name, "w");
 
@@ -68,120 +67,71 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
   // next, compose and dump what we want to say.
 
   // calc throughput.
+  double seconds = this->diff_sec (base_time_, end_time_);
 
-  ACE_TCHAR out_msg[BUFSIZ];
+  double t_avg = samples_count_ / seconds;
 
-  ACE_hrtime_t elapsed_microseconds = (end_time_ - base_time_) / scale_factor;
-  double elapsed_seconds =
-    ACE_CU64_TO_CU32(elapsed_microseconds) / 1000000.0;
-  double throughput =
-    double(samples_count_) / elapsed_seconds;
+  char out_msg[BUFSIZ];
 
-  ACE_OS::sprintf (out_msg, "#Throughtput: %f\n", throughput);
+  ACE_OS::sprintf (out_msg,
+                   "# Throughput: %.2f (events/second) [%u samples in %.2f seconds]\n",
+                   t_avg, samples_count_, seconds);
   ACE_OS::fprintf (output_file, "%s\n",out_msg);
 
-  // dump latency stats.
-  this->dump_latency_stats (out_msg, scale_factor);
-  ACE_OS::fprintf (output_file, "%s\n",out_msg);
-  ACE_OS::fprintf (output_file, "#Invocation time \t Execution time\n");
-
-  // dump the samples recorded.
+  // Calc the mean.
   for (size_t i = 0; i != this->samples_count_; ++i)
     {
-      ACE_UINT64 x = this->time_inv_[i] / scale_factor;
-      ACE_UINT32 val_1 = ACE_CU64_TO_CU32 (x);
+      ACE_UINT32 val_2 = Task_Stats::diff_usec (time_inv_[i], time_exec_[i]);
 
-      ACE_UINT64 y = this->time_exec_[i] / scale_factor;
-      ACE_UINT32 val_2 = ACE_CU64_TO_CU32 (y);
+      // Write the normalized value.
+      // we will need this to calculate the var^2
+      this->time_exec_[i] = val_2;
 
-      ACE_OS::fprintf (output_file, "%u \t %u\n",val_1, val_2);
+      this->mean_ += val_2;
     }
 
-  ACE_OS::fclose (output_file);
-}
+  // calculate the mean.
+  this->mean_ /= this->samples_count_;
 
-void
-Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf)
-{
-  if (this->samples_count_ == 0u)
+  // Calculate the var^2
+  for (size_t i = 0; i != this->samples_count_; ++i)
     {
-      ACE_OS::sprintf (out_msg,
-                       ACE_LIB_TEXT ("# no data collected\n"));
-      return;
-    }
+      ACE_UINT64 diff = this->time_exec_[i] - this->mean_;
 
-  ACE_UINT64 avg = this->sum_ / this->samples_count_;
-  ACE_UINT64 dev =
+      ACE_UINT64 diff_sq =
 #if defined ACE_LACKS_LONGLONG_T
-    ACE_static_cast (ACE_U_LongLong,
-                     this->sum2_ / this->samples_count_)
-    - avg * ACE_U64_TO_U32(avg);
+        diff * ACE_U64_TO_U32(diff);
 #else  /* ! ACE_LACKS_LONGLONG_T */
-    this->sum2_ / this->samples_count_ - avg * avg;
+      diff * diff;
 #endif /* ! ACE_LACKS_LONGLONG_T */
 
-    ACE_UINT64 l_min_ = this->exec_time_min_ / sf;
-    ACE_UINT32 l_min = ACE_CU64_TO_CU32 (l_min_);
-
-    ACE_UINT64 l_max_ = this->exec_time_max_ / sf;
-    ACE_UINT32 l_max = ACE_CU64_TO_CU32 (l_max_);
-
-    /*
-    ACE_UINT64 l_avg_ = avg / sf;
-    ACE_UINT32 l_avg = ACE_CU64_TO_CU32 (l_avg_);
-
-    ACE_UINT64 l_dev_ = dev / sf;
-    ACE_UINT32 l_dev = ACE_CU64_TO_CU32 (l_dev_);
-    */
-
-    double l_avg = ACE_CU64_TO_CU32 (avg) / sf;
-    double l_dev = ACE_CU64_TO_CU32 (dev) / (sf * sf);
-
-    ACE_UINT64 tmin_ = this->time_inv_[0] / sf;
-    ACE_UINT32 tmin = ACE_CU64_TO_CU32 (tmin_);
-
-    ACE_UINT64 tmax_ = this->time_inv_[samples_count_-1] / sf;
-    ACE_UINT32 tmax = ACE_CU64_TO_CU32 (tmax_);
-
-    ACE_OS::sprintf(out_msg,
-                  ACE_LIB_TEXT ("#latency   : %u[%d]/%.2f/%u[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %u, last invocation time = %u\n"),
-                  l_min, this->exec_time_min_at_,
-                  l_avg,
-                  l_max, this->exec_time_max_at_,
-                  l_dev,
-                  tmin,tmax);
-    /*
-  double l_min = ACE_CU64_TO_CU32 (this->exec_time_min_) / sf;
-  double l_max = ACE_CU64_TO_CU32 (this->exec_time_max_) / sf;
-  double l_avg = ACE_CU64_TO_CU32 (avg) / sf;
-  double l_dev = ACE_CU64_TO_CU32 (dev) / (sf * sf);
-
-  double tmin = ACE_CU64_TO_CU32 (this->time_inv_[0])/sf;
-  double tmax = ACE_CU64_TO_CU32 (this->time_inv_[samples_count_-1])/sf;
-
-  ACE_OS::sprintf(out_msg,
-                  ACE_LIB_TEXT ("#latency   : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %.0f, last invocation time = %.0f\n"),
-                  l_min, this->exec_time_min_at_,
-                  l_avg,
-                  l_max, this->exec_time_max_at_,
-                  l_dev,
-                  tmin,tmax);
-
-
-  ACE_OS::sprintf(out_msg,
-                  ACE_LIB_TEXT ("#latency   : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"),
-                  l_min, this->exec_time_min_at_,
-                  l_avg,
-                  l_max, this->exec_time_max_at_,
-                  l_dev);
-
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("#latency   : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"),
-                  l_min, this->exec_time_min_at_,
-                  l_avg,
-                  l_max, this->exec_time_max_at_,
-                  l_dev));
-  */
+      this->var_2_ += diff_sq;
+    }
+
+  this->var_2_ /= this->samples_count_;
+
+  ACE_OS::fprintf (output_file, "## Avg = %u, Var^2 = %u\n"
+                   , ACE_CU64_TO_CU32 (this->mean_)
+                   , ACE_CU64_TO_CU32 (this->var_2_));
+
+  ACE_DEBUG ((LM_DEBUG, " Avg = %u, Var^2 = %u\n"
+              , ACE_CU64_TO_CU32 (this->mean_)
+              , ACE_CU64_TO_CU32 (this->var_2_)));
+
+  // dump the samples recorded.
+  ACE_OS::fprintf (output_file, "#Invocation time \t Execution time\n");
+
+  for (size_t i = 0; i != this->samples_count_; ++i)
+    {
+      ACE_UINT32 val_1 = Task_Stats::diff_usec (base_time_, time_inv_[i]);
+
+      ACE_OS::fprintf (output_file, "%u \t %u\n",val_1,
+                       ACE_CU64_TO_CU32 (time_exec_[i]));
+    }
+
+  ACE_OS::fclose (output_file);
 }
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Singleton<Base_Time, TAO_SYNCH_MUTEX>;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
index cc7a68b2c43..8f3ef6acebb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
@@ -49,9 +49,18 @@ class TAO_NOTIFY_TEST_Export Task_Stats
   /// Destructor
   ~Task_Stats (void);
 
+  /// Useful Global Scale Factor
+  static ACE_UINT32 gsf_;
+
   /// Init
   int init (size_t max_samples);
 
+  /// Useful helper to calculate diff in sec.
+  static double diff_sec (ACE_hrtime_t& before, ACE_hrtime_t& after);
+
+  /// Useful helper to calculate diff in usec.
+  static ACE_UINT32 diff_usec (ACE_hrtime_t& before, ACE_hrtime_t& after);
+
   /// Set the base time value.
   void base_time (ACE_hrtime_t time);
 
@@ -59,16 +68,14 @@ class TAO_NOTIFY_TEST_Export Task_Stats
   void end_time (ACE_hrtime_t time);
 
   /// Record a sample
-  int sample (ACE_UINT64 inv_start_time, ACE_UINT64 inv_end_time);
+  int sample (ACE_UINT64& inv_start_time, ACE_UINT64& inv_end_time);
 
-  void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
-                     ACE_UINT32 scale_factor);
- protected:
-  void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf);
+  void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg);
 
+ protected:
   /// Base and end times
-  ACE_hrtime_t base_time_;
-  ACE_hrtime_t end_time_;
+  ACE_UINT64 base_time_;
+  ACE_UINT64 end_time_;
 
   /// The maximum number of samples
   ACE_UINT32 max_samples_;
@@ -80,23 +87,11 @@ class TAO_NOTIFY_TEST_Export Task_Stats
   ACE_UINT64 *time_inv_;
   ACE_UINT64 *time_exec_;
 
-  /// The minimum value
-  ACE_UINT64 exec_time_min_;
-
-  /// The number of the sample that had the minimum value
-  ACE_UINT32 exec_time_min_at_;
-
-  /// The maximum value
-  ACE_UINT64 exec_time_max_;
-
-  /// The number of the sample that had the maximum value
-  ACE_UINT32 exec_time_max_at_;
-
-  /// The sum of all the values
-  ACE_UINT64 sum_;
+  /// The mean of the data set.
+  ACE_UINT64 mean_;
 
-  /// The sum of the square of all the values
-  ACE_UINT64 sum2_;
+  /// The Var^2 of the data set.
+  ACE_UINT64 var_2_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
index 0e9aa2b2bb7..4362f04007c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
@@ -1,55 +1,54 @@
 //$Id$
 
+#include "ace/High_Res_Timer.h"
+
+ACE_INLINE double
+Task_Stats::diff_sec (ACE_hrtime_t& before, ACE_hrtime_t& after)
+{
+  double seconds =
+#if defined ACE_LACKS_LONGLONG_T
+    (after - before) / gsf_;
+#else  /* ! ACE_LACKS_LONGLONG_T */
+    ACE_static_cast (double,
+                     ACE_UINT64_DBLCAST_ADAPTER((after - before) / gsf_));
+#endif /* ! ACE_LACKS_LONGLONG_T */
+  seconds /= ACE_HR_SCALE_CONVERSION;
+
+  return seconds;
+}
+
+ACE_INLINE ACE_UINT32
+Task_Stats::diff_usec (ACE_hrtime_t& before, ACE_hrtime_t& after)
+{
+  // convert to microseconds
+  #if !defined ACE_LACKS_LONGLONG_T
+   ACE_UINT32 elapsed_microseconds = ACE_UINT32((after - before) / gsf_);
+  #else  /* ! ACE_LACKS_LONGLONG_T */
+
+  ACE_UINT32 elapsed_microseconds = (after - before) / gsf_;
+
+  #endif /* ! ACE_LACKS_LONGLONG_T */
+
+  #if defined (ACE_WIN32)
+    elapsed_microseconds*=1000; // convert to uSec on Win32
+  #endif /* ACE_WIN32 */
+
+  return elapsed_microseconds;
+}
+
 ACE_INLINE int
-Task_Stats::sample (ACE_UINT64 inv_start_time, ACE_UINT64 inv_end_time)
+Task_Stats::sample (ACE_UINT64& inv_start_time, ACE_UINT64& inv_end_time)
 {
   if (this->samples_count_ >= this->max_samples_)
   {
     ACE_DEBUG ((LM_DEBUG, "Task_Stats::sample ret -1\n"));
     return -1;
    }
-  ACE_UINT64 inv_value, exec_value;
-
-  inv_value = inv_start_time - base_time_;
-  exec_value  = inv_end_time - inv_start_time;
 
-  this->time_inv_[this->samples_count_] = inv_value;
-  this->time_exec_[this->samples_count_] = exec_value;
+  this->time_inv_[this->samples_count_] = inv_start_time;
+  this->time_exec_[this->samples_count_] = inv_end_time;
 
   this->samples_count_++;
 
-  if (this->samples_count_ == 1u)
-    {
-      this->exec_time_min_ = exec_value;
-      this->exec_time_min_at_ = this->samples_count_;
-      this->exec_time_max_ = exec_value;
-      this->exec_time_max_at_ = this->samples_count_;
-      this->sum_ = exec_value;
-#if defined ACE_LACKS_LONGLONG_T
-      this->sum2_ = exec_value * ACE_U64_TO_U32 (exec_value);
-#else  /* ! ACE_LACKS_LONGLONG_T */
-      this->sum2_ = exec_value * exec_value;
-#endif /* ! ACE_LACKS_LONGLONG_T */
-    }
-  else
-    {
-      if (this->exec_time_min_ > exec_value)
-        {
-          this->exec_time_min_ = exec_value;
-          this->exec_time_min_at_ = this->samples_count_;
-        }
-      if (this->exec_time_max_ < exec_value)
-        {
-          this->exec_time_max_ = exec_value;
-          this->exec_time_max_at_ = this->samples_count_;
-        }
-
-      this->sum_  += exec_value;
-#if defined ACE_LACKS_LONGLONG_T
-      this->sum2_ += exec_value * ACE_U64_TO_U32 (exec_value);
-#else  /* ! ACE_LACKS_LONGLONG_T */
-      this->sum2_ += exec_value * exec_value;
-#endif /* ! ACE_LACKS_LONGLONG_T */
- }
-    return 0;
+  return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_0/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_0/supplier.conf
new file mode 100644
index 00000000000..40f765e7015
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_0/supplier.conf
@@ -0,0 +1,32 @@
+## $Id$
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 1 1 0 -Lane 50 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 0 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_10/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_10/supplier.conf
new file mode 100644
index 00000000000..c94c773cf14
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_10/supplier.conf
@@ -0,0 +1,32 @@
+## $Id$
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 1 1 0 -Lane 50 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 10 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_15/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_15/supplier.conf
new file mode 100644
index 00000000000..cca64d86524
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_15/supplier.conf
@@ -0,0 +1,32 @@
+## $Id$
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 1 1 0 -Lane 50 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 15 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_20/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_20/supplier.conf
new file mode 100644
index 00000000000..70af3c0a13c
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_20/supplier.conf
@@ -0,0 +1,32 @@
+## $Id$
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 1 1 0 -Lane 50 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 20 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_25/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_25/supplier.conf
new file mode 100644
index 00000000000..093c15fca1c
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_25/supplier.conf
@@ -0,0 +1,32 @@
+## $Id$
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 1 1 0 -Lane 50 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 25 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_30/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_30/supplier.conf
new file mode 100644
index 00000000000..7912eaefff7
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_30/supplier.conf
@@ -0,0 +1,32 @@
+## $Id$
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 1 1 0 -Lane 50 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 30 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_35/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_35/supplier.conf
new file mode 100644
index 00000000000..25f4732e16e
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_35/supplier.conf
@@ -0,0 +1,32 @@
+## $Id$
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 1 1 0 -Lane 50 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 35 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_40/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_40/supplier.conf
new file mode 100644
index 00000000000..6bfca4d39c4
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_40/supplier.conf
@@ -0,0 +1,32 @@
+## $Id$
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 1 1 0 -Lane 50 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 40 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_45/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_45/supplier.conf
new file mode 100644
index 00000000000..d23f35bc0a2
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_45/supplier.conf
@@ -0,0 +1,32 @@
+## $Id$
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 1 1 0 -Lane 50 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 45 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_5/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_5/supplier.conf
new file mode 100644
index 00000000000..8fc62c3a19c
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_5/supplier.conf
@@ -0,0 +1,31 @@
+## $Id$
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 1 1 0 -Lane 50 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 5 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_50/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_50/supplier.conf
new file mode 100644
index 00000000000..450611a19e6
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/Load_50/supplier.conf
@@ -0,0 +1,32 @@
+## $Id$
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 3 -Lane 1 1 0 -Lane 50 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 50 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/consumer.conf
new file mode 100644
index 00000000000..de497511116
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/consumer.conf
@@ -0,0 +1,31 @@
+## $Id$
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+
+dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+
+dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##----------- Create an RT POA to host local consumer objects-----------
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 3 -Lane 1 1 0 -Lane 50 1 0 -Lane 90 1 0"
+
+##--------- Consumer Admin 1 -------------
+static Command_Builder "ConsumerAdmin -Create ca1 ec1 -AND_OP"
+
+##--------- Consumer  , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_high -Admin ca1 -POA poa_1"
+static Command_Builder "PeriodicConsumer -Subscription c_high +H"
+
+##------- Run---------
+static Command_Builder "Application -SignalPeer"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/cos_notify.conf
new file mode 100644
index 00000000000..cc95424c25d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/cos_notify.conf
@@ -0,0 +1,4 @@
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"         
+dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () ""         
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""         
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/rt_notify.conf
new file mode 100644
index 00000000000..c2c8a049a4b
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/rt_notify.conf
@@ -0,0 +1,4 @@
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"         
+dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () ""         
+dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""         
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/run_all.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/run_all.pl
new file mode 100644
index 00000000000..86c2d5d206d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/run_all.pl
@@ -0,0 +1,58 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../../../bin";
+use PerlACE::Run_Test;
+use File::Copy;
+use Getopt::Long;
+
+GetOptions ("rt" => \$rt,
+            "cos" => \$cos,
+            "all" => \$all);
+
+@list=glob("*");
+
+for $file (@list)
+{
+    # default to rt
+    if (!$all && !$rt && !$cos)
+    {
+        $rt = 1;
+    }
+
+    if (-d $file)
+    {
+        if ($all || $rt)
+        {
+            print STDERR "Running $file test with RT Notification\n";
+
+            $cmd = "run_test.pl -n rt_notify.conf -s $file/supplier.conf -c consumer.conf -o $file/rt_output";
+
+            $status = system ("perl $cmd");
+
+            if ($status != 0)
+            {
+                print STDERR "ERROR: $file test returned $status\n";
+            }
+        }
+
+
+        if ($all || $cos)
+        {
+            print STDERR "Running $file test with COS Notification\n";
+
+            $cmd = "run_test.pl -n cos_notify.conf -s $file/supplier.conf -c consumer.conf -o $file/cos_output";
+
+            $status = system ("perl $cmd");
+
+            if ($status != 0)
+            {
+                print STDERR "ERROR: $file test returned $status\n";
+            }
+        }
+    }
+}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/run_test.pl
new file mode 100644
index 00000000000..8b4aafa7924
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_10ms_Lanes/run_test.pl
@@ -0,0 +1,171 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../../../bin";
+use PerlACE::Run_Test;
+use File::Copy;
+use Getopt::Std;
+
+# -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h
+getopts ("n:s:c:o:h");
+
+if ($opt_h)
+{
+    print STDERR "-n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h\n";
+    exit 0;
+}
+
+$experiment_timeout = 120;
+$startup_timeout = 120;
+
+if ($opt_n)
+{
+    $notify_conf = PerlACE::LocalFile ($opt_n);
+
+}else
+{
+    $notify_conf = PerlACE::LocalFile ("notify.conf");
+}
+
+if ($opt_s)
+{
+    $supplier_conf = PerlACE::LocalFile ($opt_s);
+
+}else
+{
+    $supplier_conf = PerlACE::LocalFile ("supplier.conf");
+}
+
+if ($opt_c)
+{
+    $consumer_conf = PerlACE::LocalFile ($opt_c);
+
+}else
+{
+    $consumer_conf = PerlACE::LocalFile ("consumer.conf");
+}
+
+$notify_ior = PerlACE::LocalFile ("notify.ior");
+
+$naming_ior = PerlACE::LocalFile ("naming.ior");
+
+$supplier_ior = PerlACE::LocalFile ("supplier.ior");
+
+@list=glob("*.dat");
+for $file (@list)
+{
+  unlink $file or die "Could not delete $file";
+}
+
+$status = 0;
+
+$Naming = new PerlACE::Process ("../../../../../Naming_Service/Naming_Service",
+                                "-o $naming_ior");
+
+$Notification = new PerlACE::Process ("../../../../../Notify_Service/Notify_Service");
+
+#$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf -ORBDebugLevel 1";
+
+$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf";
+
+$Supplier = new PerlACE::Process ("../../../Driver/Notify_Tests_Driver");
+
+$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf";
+
+$Consumer = new PerlACE::Process ("../../../Driver/Notify_Tests_Driver");
+
+$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf";
+
+#$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1";
+
+unlink $naming_ior;
+$Naming->Spawn ();
+
+if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the naming service to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $notify_ior;
+$Notification->Arguments ($Notify_Args);
+$args = $Notification->Arguments ();
+print STDERR "Running Notification with arguments: $args\n";
+$Notification->Spawn ();
+
+if (PerlACE::waitforfile_timed ($notify_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the notify service to start\n";
+  $Notification->Kill ();
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $supplier_ior;
+$Supplier->Arguments ($Supplier_Args);
+$args = $Supplier->Arguments ();
+print STDERR "Running Supplier with arguments: $args\n";
+$Supplier->Spawn ();
+
+if (PerlACE::waitforfile_timed ($supplier_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the supplier to start\n";
+  $Supplier->Kill ();
+  $Notification->Kill ();
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $consumer_ior;
+$Consumer->Arguments ($Consumer_Args);
+$args = $Consumer->Arguments ();
+print STDERR "Running Consumer with arguments: $args\n";
+$status = $Consumer->SpawnWaitKill ($experiment_timeout);
+
+if ($status != 0)
+  {
+    print STDERR "ERROR: Consumer returned $status\n";
+    $Supplier->Kill ();
+    $Notification->Kill ();
+    $Naming->Kill ();
+    exit 1;
+  }
+
+unlink $consumer_ior;
+
+$Supplier->Kill ();
+unlink $supplier_ior;
+
+$Notification->Kill ();
+unlink $notify_ior;
+
+$Naming->Kill ();
+unlink $naming_ior;
+
+if ($opt_o)
+  {
+      $results_directory = PerlACE::LocalFile ($opt_o);
+
+      if (! -e $results_directory)
+      {
+          mkdir $results_directory, 0777;
+      }
+
+      print STDERR "Saving results to $results_directory\n";
+
+      @list=glob("*.dat");
+      for $file (@list)
+      {
+          copy ("$file", "$results_directory/$file");
+      }
+
+      @list=glob("*.conf");
+      for $file (@list)
+      {
+          copy ("$file", "$results_directory/$file");
+      }
+  }
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf
new file mode 100644
index 00000000000..f60a912ed0d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_0/supplier.conf
@@ -0,0 +1,48 @@
+## $Id$
+## This file has the following configuration:
+## EventChannel ec1 with 1 Thread
+## SupplierAdmim sa1 with 1 Thread
+## SupplierAdmin sa2
+## 
+## Supplier s1 has 1 Thread and is connected to sa1
+## Supplier s2 is connected to sa1
+## 
+## Supplier s3 is connected to sa2
+## 
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 4 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s1 connected to sa1. -----
+static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 0 -RunTime 15"
+
+### --- Create Supplier s2 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 0 -RunTime 15"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 0 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf
new file mode 100644
index 00000000000..5bfa97cf88b
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_10/supplier.conf
@@ -0,0 +1,48 @@
+## $Id$
+## This file has the following configuration:
+## EventChannel ec1 with 1 Thread
+## SupplierAdmim sa1 with 1 Thread
+## SupplierAdmin sa2
+## 
+## Supplier s1 has 1 Thread and is connected to sa1
+## Supplier s2 is connected to sa1
+## 
+## Supplier s3 is connected to sa2
+## 
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s1 connected to sa1. -----
+static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 10 -RunTime 15"
+
+### --- Create Supplier s2 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 10 -RunTime 15"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 10 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf
new file mode 100644
index 00000000000..1d2e5d17a34
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_15/supplier.conf
@@ -0,0 +1,48 @@
+## $Id$
+## This file has the following configuration:
+## EventChannel ec1 with 1 Thread
+## SupplierAdmim sa1 with 1 Thread
+## SupplierAdmin sa2
+## 
+## Supplier s1 has 1 Thread and is connected to sa1
+## Supplier s2 is connected to sa1
+## 
+## Supplier s3 is connected to sa2
+## 
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s1 connected to sa1. -----
+static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 15 -RunTime 15"
+
+### --- Create Supplier s2 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 15 -RunTime 15"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 15 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf
new file mode 100644
index 00000000000..3436d7c884c
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_20/supplier.conf
@@ -0,0 +1,48 @@
+## $Id$
+## This file has the following configuration:
+## EventChannel ec1 with 1 Thread
+## SupplierAdmim sa1 with 1 Thread
+## SupplierAdmin sa2
+## 
+## Supplier s1 has 1 Thread and is connected to sa1
+## Supplier s2 is connected to sa1
+## 
+## Supplier s3 is connected to sa2
+## 
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s1 connected to sa1. -----
+static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 20 -RunTime 15"
+
+### --- Create Supplier s2 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 20 -RunTime 15"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 20 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf
new file mode 100644
index 00000000000..a9d569bba22
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_25/supplier.conf
@@ -0,0 +1,48 @@
+## $Id$
+## This file has the following configuration:
+## EventChannel ec1 with 1 Thread
+## SupplierAdmim sa1 with 1 Thread
+## SupplierAdmin sa2
+## 
+## Supplier s1 has 1 Thread and is connected to sa1
+## Supplier s2 is connected to sa1
+## 
+## Supplier s3 is connected to sa2
+## 
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s1 connected to sa1. -----
+static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 25 -RunTime 15"
+
+### --- Create Supplier s2 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 25 -RunTime 15"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 25 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf
new file mode 100644
index 00000000000..ab3d12d75aa
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_30/supplier.conf
@@ -0,0 +1,48 @@
+## $Id$
+## This file has the following configuration:
+## EventChannel ec1 with 1 Thread
+## SupplierAdmim sa1 with 1 Thread
+## SupplierAdmin sa2
+## 
+## Supplier s1 has 1 Thread and is connected to sa1
+## Supplier s2 is connected to sa1
+## 
+## Supplier s3 is connected to sa2
+## 
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s1 connected to sa1. -----
+static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 30 -RunTime 15"
+
+### --- Create Supplier s2 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 30 -RunTime 15"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 30 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf
new file mode 100644
index 00000000000..ed7f23f47ad
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_35/supplier.conf
@@ -0,0 +1,48 @@
+## $Id$
+## This file has the following configuration:
+## EventChannel ec1 with 1 Thread
+## SupplierAdmim sa1 with 1 Thread
+## SupplierAdmin sa2
+## 
+## Supplier s1 has 1 Thread and is connected to sa1
+## Supplier s2 is connected to sa1
+## 
+## Supplier s3 is connected to sa2
+## 
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s1 connected to sa1. -----
+static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 35 -RunTime 15"
+
+### --- Create Supplier s2 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 35 -RunTime 15"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 35 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf
new file mode 100644
index 00000000000..2cc614ccfcb
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_40/supplier.conf
@@ -0,0 +1,48 @@
+## $Id$
+## This file has the following configuration:
+## EventChannel ec1 with 1 Thread
+## SupplierAdmim sa1 with 1 Thread
+## SupplierAdmin sa2
+## 
+## Supplier s1 has 1 Thread and is connected to sa1
+## Supplier s2 is connected to sa1
+## 
+## Supplier s3 is connected to sa2
+## 
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s1 connected to sa1. -----
+static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 40 -RunTime 15"
+
+### --- Create Supplier s2 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 40 -RunTime 15"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 40 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf
new file mode 100644
index 00000000000..7ee4ec827e7
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_45/supplier.conf
@@ -0,0 +1,50 @@
+## $Id$
+## This file has the following configuration:
+## EventChannel ec1 with 1 Thread
+## SupplierAdmim sa1 with 1 Thread
+## SupplierAdmin sa2
+## 
+## Supplier s1 has 1 Thread and is connected to sa1
+## Supplier s2 is connected to sa1
+## 
+## Supplier s3 is connected to sa2
+## 
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+# CosNotification does not support Lanes so we use 3 threads.
+#static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPool -Threads 1 -Priority 0"
+#static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s1 connected to sa1. -----
+static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 45 -RunTime 15"
+
+### --- Create Supplier s2 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 45 -RunTime 15"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 45 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf
new file mode 100644
index 00000000000..93fbbcb2244
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_5/supplier.conf
@@ -0,0 +1,48 @@
+## $Id$
+## This file has the following configuration:
+## EventChannel ec1 with 1 Thread
+## SupplierAdmim sa1 with 1 Thread
+## SupplierAdmin sa2
+## 
+## Supplier s1 has 1 Thread and is connected to sa1
+## Supplier s2 is connected to sa1
+## 
+## Supplier s3 is connected to sa2
+## 
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s1 connected to sa1. -----
+static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 5 -RunTime 15"
+
+### --- Create Supplier s2 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 5 -RunTime 15"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 5 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf
new file mode 100644
index 00000000000..8e103ead0fa
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/Load_50/supplier.conf
@@ -0,0 +1,48 @@
+## $Id$
+## This file has the following configuration:
+## EventChannel ec1 with 1 Thread
+## SupplierAdmim sa1 with 1 Thread
+## SupplierAdmin sa2
+## 
+## Supplier s1 has 1 Thread and is connected to sa1
+## Supplier s2 is connected to sa1
+## 
+## Supplier s3 is connected to sa2
+## 
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s1 connected to sa1. -----
+static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 50 -RunTime 15"
+
+### --- Create Supplier s2 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 50 -RunTime 15"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 10000 -Iter 50000 -Load 50 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf
new file mode 100644
index 00000000000..7b8cc52238e
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/consumer.conf
@@ -0,0 +1,40 @@
+## $Id$
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+
+dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##----------- Create an RT POA to host local consumer objects-----------
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+#static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 3 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+##--------- Consumer Admin 1 -------------
+static Command_Builder "ConsumerAdmin -Create ca1 ec1 -AND_OP"
+
+##--------- Consumer 1 , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_low -Admin ca1 -POA poa_1"
+static Command_Builder "PeriodicConsumer -Subscription c_low +L"
+
+##--------- Consumer 2 , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_med -Admin ca1 -POA poa_1"
+static Command_Builder "PeriodicConsumer -Subscription c_med +M"
+
+##--------- Consumer 3 , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_high -Admin ca1 -POA poa_1"
+static Command_Builder "PeriodicConsumer -Subscription c_high +H"
+
+##------- Run---------
+static Command_Builder "Application -SignalPeer"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
new file mode 100644
index 00000000000..cc95424c25d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
@@ -0,0 +1,4 @@
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"         
+dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () ""         
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""         
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
new file mode 100644
index 00000000000..c2c8a049a4b
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
@@ -0,0 +1,4 @@
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"         
+dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () ""         
+dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""         
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_all.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_all.pl
new file mode 100755
index 00000000000..86c2d5d206d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_all.pl
@@ -0,0 +1,58 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../../../bin";
+use PerlACE::Run_Test;
+use File::Copy;
+use Getopt::Long;
+
+GetOptions ("rt" => \$rt,
+            "cos" => \$cos,
+            "all" => \$all);
+
+@list=glob("*");
+
+for $file (@list)
+{
+    # default to rt
+    if (!$all && !$rt && !$cos)
+    {
+        $rt = 1;
+    }
+
+    if (-d $file)
+    {
+        if ($all || $rt)
+        {
+            print STDERR "Running $file test with RT Notification\n";
+
+            $cmd = "run_test.pl -n rt_notify.conf -s $file/supplier.conf -c consumer.conf -o $file/rt_output";
+
+            $status = system ("perl $cmd");
+
+            if ($status != 0)
+            {
+                print STDERR "ERROR: $file test returned $status\n";
+            }
+        }
+
+
+        if ($all || $cos)
+        {
+            print STDERR "Running $file test with COS Notification\n";
+
+            $cmd = "run_test.pl -n cos_notify.conf -s $file/supplier.conf -c consumer.conf -o $file/cos_output";
+
+            $status = system ("perl $cmd");
+
+            if ($status != 0)
+            {
+                print STDERR "ERROR: $file test returned $status\n";
+            }
+        }
+    }
+}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
new file mode 100755
index 00000000000..8b4aafa7924
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
@@ -0,0 +1,171 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../../../bin";
+use PerlACE::Run_Test;
+use File::Copy;
+use Getopt::Std;
+
+# -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h
+getopts ("n:s:c:o:h");
+
+if ($opt_h)
+{
+    print STDERR "-n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h\n";
+    exit 0;
+}
+
+$experiment_timeout = 120;
+$startup_timeout = 120;
+
+if ($opt_n)
+{
+    $notify_conf = PerlACE::LocalFile ($opt_n);
+
+}else
+{
+    $notify_conf = PerlACE::LocalFile ("notify.conf");
+}
+
+if ($opt_s)
+{
+    $supplier_conf = PerlACE::LocalFile ($opt_s);
+
+}else
+{
+    $supplier_conf = PerlACE::LocalFile ("supplier.conf");
+}
+
+if ($opt_c)
+{
+    $consumer_conf = PerlACE::LocalFile ($opt_c);
+
+}else
+{
+    $consumer_conf = PerlACE::LocalFile ("consumer.conf");
+}
+
+$notify_ior = PerlACE::LocalFile ("notify.ior");
+
+$naming_ior = PerlACE::LocalFile ("naming.ior");
+
+$supplier_ior = PerlACE::LocalFile ("supplier.ior");
+
+@list=glob("*.dat");
+for $file (@list)
+{
+  unlink $file or die "Could not delete $file";
+}
+
+$status = 0;
+
+$Naming = new PerlACE::Process ("../../../../../Naming_Service/Naming_Service",
+                                "-o $naming_ior");
+
+$Notification = new PerlACE::Process ("../../../../../Notify_Service/Notify_Service");
+
+#$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf -ORBDebugLevel 1";
+
+$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf";
+
+$Supplier = new PerlACE::Process ("../../../Driver/Notify_Tests_Driver");
+
+$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf";
+
+$Consumer = new PerlACE::Process ("../../../Driver/Notify_Tests_Driver");
+
+$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf";
+
+#$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1";
+
+unlink $naming_ior;
+$Naming->Spawn ();
+
+if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the naming service to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $notify_ior;
+$Notification->Arguments ($Notify_Args);
+$args = $Notification->Arguments ();
+print STDERR "Running Notification with arguments: $args\n";
+$Notification->Spawn ();
+
+if (PerlACE::waitforfile_timed ($notify_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the notify service to start\n";
+  $Notification->Kill ();
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $supplier_ior;
+$Supplier->Arguments ($Supplier_Args);
+$args = $Supplier->Arguments ();
+print STDERR "Running Supplier with arguments: $args\n";
+$Supplier->Spawn ();
+
+if (PerlACE::waitforfile_timed ($supplier_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the supplier to start\n";
+  $Supplier->Kill ();
+  $Notification->Kill ();
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $consumer_ior;
+$Consumer->Arguments ($Consumer_Args);
+$args = $Consumer->Arguments ();
+print STDERR "Running Consumer with arguments: $args\n";
+$status = $Consumer->SpawnWaitKill ($experiment_timeout);
+
+if ($status != 0)
+  {
+    print STDERR "ERROR: Consumer returned $status\n";
+    $Supplier->Kill ();
+    $Notification->Kill ();
+    $Naming->Kill ();
+    exit 1;
+  }
+
+unlink $consumer_ior;
+
+$Supplier->Kill ();
+unlink $supplier_ior;
+
+$Notification->Kill ();
+unlink $notify_ior;
+
+$Naming->Kill ();
+unlink $naming_ior;
+
+if ($opt_o)
+  {
+      $results_directory = PerlACE::LocalFile ($opt_o);
+
+      if (! -e $results_directory)
+      {
+          mkdir $results_directory, 0777;
+      }
+
+      print STDERR "Saving results to $results_directory\n";
+
+      @list=glob("*.dat");
+      for $file (@list)
+      {
+          copy ("$file", "$results_directory/$file");
+      }
+
+      @list=glob("*.conf");
+      for $file (@list)
+      {
+          copy ("$file", "$results_directory/$file");
+      }
+  }
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf
new file mode 100644
index 00000000000..32d6bf1c012
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/consumer.conf
@@ -0,0 +1,26 @@
+## $Id$
+##---- Load the Factories------
+dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+
+dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##--------- Consumer 1 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_low -Direct"
+
+##--------- Consumer 2 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_med -Direct"
+
+##--------- Consumer 3 , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_high -Direct"
+
+##------- Run---------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
new file mode 100755
index 00000000000..40536867dc6
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
@@ -0,0 +1,95 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../../../../bin";
+use PerlACE::Run_Test;
+use File::Copy;
+
+$experiment_timeout = 600;
+$startup_timeout = 600;
+$naming_ior = PerlACE::LocalFile ("naming.ior");
+$consumer_ior = PerlACE::LocalFile ("consumer.ior");
+$supplier_conf = PerlACE::LocalFile ("supplier.conf");
+$consumer_conf = PerlACE::LocalFile ("consumer.conf");
+$status = 0;
+
+$Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service",
+                                "-o $naming_ior");
+
+$Supplier = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$consumer_ior -ORBSvcConf $supplier_conf";
+
+$Consumer = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+#$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $consumer_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1";
+$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $consumer_ior -ORBSvcConf $consumer_conf";
+
+unlink $naming_ior;
+$Naming->Spawn ();
+
+if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the naming service to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $consumer_ior;
+$Consumer->Arguments ($Consumer_Args);
+$args = $Consumer->Arguments ();
+print STDERR "Running Consumer with arguments: $args\n";
+$status = $Consumer->Spawn ();
+
+if (PerlACE::waitforfile_timed ($consumer_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the consumer to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+$Supplier->Arguments ($Supplier_Args);
+$args = $Supplier->Arguments ();
+print STDERR "Running Supplier with arguments: $args\n";
+$Supplier->SpawnWaitKill ($experiment_timeout);
+
+if ($status != 0)
+  {
+    print STDERR "ERROR: Supplier returned $status\n";
+    $Supplier->Kill ();
+    $Notification->Kill ();
+    $Naming->Kill ();
+    exit 1;
+  }
+
+$Supplier->Kill ();
+
+$Consumer->Kill ();
+unlink $consumer_ior;
+
+$Naming->Kill ();
+unlink $naming_ior;
+
+if ($#ARGV > -1)
+  {
+    $results_directory = $ARGV[0];
+    print STDERR "Saving results to $results_directory\n";
+
+    mkdir $results_directory, 0777;
+
+    @list=glob("*.dat");
+    for $file (@list)
+      {
+        copy ("$file", "$results_directory/$file");
+      }
+
+    @list=glob("*.conf");
+    for $file (@list)
+      {
+        copy ("$file", "$results_directory/$file");
+      }
+  }
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf
new file mode 100644
index 00000000000..00bc986a146
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/supplier.conf
@@ -0,0 +1,30 @@
+## $Id$
+## This file has the following configuration:
+## 
+
+##---- Load the Factories------
+dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+### --- Create Supplier s1 connected to sa1. -----
+#static Command_Builder "PeriodicSupplier -Create s_low -Direct c_low -EventType L -Priority 10 -Period 0 -Iter 5000 -Load 0 -RunTime 15"
+
+### --- Create Supplier s2 connected to sa1 ----
+#static Command_Builder "PeriodicSupplier -Create s_med -Direct c_med -EventType M -Priority 60 -Period 0 -Iter 5000 -Load 0 -RunTime 15"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Direct c_high -EventType H -Priority 90 -Period 0 -Iter 50000 -Load 0 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -SignalPeer"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf
new file mode 100644
index 00000000000..d65da00875d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/consumer.conf
@@ -0,0 +1,34 @@
+## $Id$
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+
+dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##----------- Create an RT POA to host local consumer objects-----------
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 4 -Lane 1 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+
+##--------- Consumer 1 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_low -Direct -POA poa_1"
+
+##--------- Consumer 2 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_med -Direct -POA poa_1"
+
+##--------- Consumer 3 , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_high -Direct -POA poa_1"
+
+##------- Run---------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf
new file mode 100644
index 00000000000..b15e8ec7212
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf
@@ -0,0 +1,35 @@
+## $Id$
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+
+dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##----------- Create an RT POA to host local consumer objects-----------
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 4 -Lane 1 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+
+##--------- Consumer 1 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_low_relay -Relay c_low -POA poa_1"
+
+##--------- Consumer 2 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_med_relay -Relay c_med -POA poa_1"
+
+##--------- Consumer 3 , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_high_relay -Relay c_high -POA poa_1"
+
+##------- Run---------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -SignalPeer"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
new file mode 100755
index 00000000000..3fc76f501a0
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
@@ -0,0 +1,117 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../../../../bin";
+use PerlACE::Run_Test;
+use File::Copy;
+
+$experiment_timeout = 60;
+$startup_timeout = 60;
+$naming_ior = PerlACE::LocalFile ("naming.ior");
+$consumer_ior = PerlACE::LocalFile ("consumer.ior");
+$relay_ior = PerlACE::LocalFile ("relay.ior");
+
+$supplier_conf = PerlACE::LocalFile ("supplier.conf");
+$consumer_conf = PerlACE::LocalFile ("consumer.conf");
+$relay_conf = PerlACE::LocalFile ("relay.conf");
+
+$status = 0;
+
+$Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service",
+                                "-o $naming_ior");
+
+$Supplier = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$relay_ior -ORBSvcConf $supplier_conf";
+
+$Consumer = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $consumer_ior -ORBSvcConf $consumer_conf";
+
+$Relay = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Relay_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $relay_ior -IORinput file://$consumer_ior -ORBSvcConf $relay_conf";
+
+unlink $naming_ior;
+$Naming->Spawn ();
+
+if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the naming service to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $consumer_ior;
+$Consumer->Arguments ($Consumer_Args);
+$args = $Consumer->Arguments ();
+print STDERR "Running Consumer with arguments: $args\n";
+$status = $Consumer->Spawn ();
+
+if (PerlACE::waitforfile_timed ($consumer_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the consumer to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $relay_ior;
+$Relay->Arguments ($Relay_Args);
+$args = $Relay->Arguments ();
+print STDERR "Running Relay with arguments: $args\n";
+$status = $Relay->Spawn ();
+
+if (PerlACE::waitforfile_timed ($relay_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the Relay to start\n";
+  $Consumer->Kill ();
+  $Naming->Kill ();
+  exit 1;
+}
+
+$Supplier->Arguments ($Supplier_Args);
+$args = $Supplier->Arguments ();
+print STDERR "Running Supplier with arguments: $args\n";
+$Supplier->SpawnWaitKill ($experiment_timeout);
+
+if ($status != 0)
+  {
+    print STDERR "ERROR: Supplier returned $status\n";
+    $Supplier->Kill ();
+    $Notification->Kill ();
+    $Naming->Kill ();
+    exit 1;
+  }
+
+$Supplier->Kill ();
+$Consumer->Kill ();
+$Relay->Kill ();
+
+unlink $consumer_ior;
+unlink $relay_ior;
+
+$Naming->Kill ();
+unlink $naming_ior;
+
+if ($#ARGV > -1)
+  {
+    $results_directory = $ARGV[0];
+    print STDERR "Saving results to $results_directory\n";
+
+    mkdir $results_directory, 0777;
+
+    @list=glob("*.dat");
+    for $file (@list)
+      {
+        copy ("$file", "$results_directory/$file");
+      }
+
+    @list=glob("*.conf");
+    for $file (@list)
+      {
+        copy ("$file", "$results_directory/$file");
+      }
+  }
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf
new file mode 100644
index 00000000000..432dc5f51e9
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf
@@ -0,0 +1,42 @@
+## $Id$
+## This file has the following configuration:
+## EventChannel ec1 with 1 Thread
+## SupplierAdmim sa1 with 1 Thread
+## SupplierAdmin sa2
+## 
+## Supplier s1 has 1 Thread and is connected to sa1
+## Supplier s2 is connected to sa1
+## 
+## Supplier s3 is connected to sa2
+## 
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object
+*TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+### --- Create Supplier s1 connected to sa1. -----
+#static Command_Builder "PeriodicSupplier -Create s_low -Direct c_low_relay -EventType L -Priority 1 -Period 0 -Iter 50000 -Load 1 -RunTime 40"
+
+### --- Create Supplier s2 connected to sa1 ----
+#static Command_Builder "PeriodicSupplier -Create s_med -Direct c_med_relay -EventType M -Priority 2 -Period 0 -Iter 50000 -Load 1 -RunTime 40"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Direct c_high_relay -EventType H -Priority 90 -Period 0 -Iter 50000 -Load 0 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -SignalPeer"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf
new file mode 100644
index 00000000000..0db0b8a5c88
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/consumer.conf
@@ -0,0 +1,27 @@
+## $Id$
+##---- Load the Factories------
+
+dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+
+dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##--------- Consumer 1 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_low -Direct"
+
+##--------- Consumer 2 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_med -Direct"
+
+##--------- Consumer 3 , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_high -Direct"
+
+##------- Run---------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf
new file mode 100644
index 00000000000..ca2eef8baa8
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/relay.conf
@@ -0,0 +1,28 @@
+## $Id$
+##---- Load the Factories------
+
+dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+
+dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##--------- Consumer 1 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_low_relay -Relay c_low"
+
+##--------- Consumer 2 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_med_relay -Relay c_med"
+
+##--------- Consumer 3 , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_high_relay -Relay c_high"
+
+##------- Run---------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -SignalPeer"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
new file mode 100755
index 00000000000..3fc76f501a0
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
@@ -0,0 +1,117 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../../../../bin";
+use PerlACE::Run_Test;
+use File::Copy;
+
+$experiment_timeout = 60;
+$startup_timeout = 60;
+$naming_ior = PerlACE::LocalFile ("naming.ior");
+$consumer_ior = PerlACE::LocalFile ("consumer.ior");
+$relay_ior = PerlACE::LocalFile ("relay.ior");
+
+$supplier_conf = PerlACE::LocalFile ("supplier.conf");
+$consumer_conf = PerlACE::LocalFile ("consumer.conf");
+$relay_conf = PerlACE::LocalFile ("relay.conf");
+
+$status = 0;
+
+$Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service",
+                                "-o $naming_ior");
+
+$Supplier = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$relay_ior -ORBSvcConf $supplier_conf";
+
+$Consumer = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $consumer_ior -ORBSvcConf $consumer_conf";
+
+$Relay = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Relay_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $relay_ior -IORinput file://$consumer_ior -ORBSvcConf $relay_conf";
+
+unlink $naming_ior;
+$Naming->Spawn ();
+
+if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the naming service to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $consumer_ior;
+$Consumer->Arguments ($Consumer_Args);
+$args = $Consumer->Arguments ();
+print STDERR "Running Consumer with arguments: $args\n";
+$status = $Consumer->Spawn ();
+
+if (PerlACE::waitforfile_timed ($consumer_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the consumer to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $relay_ior;
+$Relay->Arguments ($Relay_Args);
+$args = $Relay->Arguments ();
+print STDERR "Running Relay with arguments: $args\n";
+$status = $Relay->Spawn ();
+
+if (PerlACE::waitforfile_timed ($relay_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the Relay to start\n";
+  $Consumer->Kill ();
+  $Naming->Kill ();
+  exit 1;
+}
+
+$Supplier->Arguments ($Supplier_Args);
+$args = $Supplier->Arguments ();
+print STDERR "Running Supplier with arguments: $args\n";
+$Supplier->SpawnWaitKill ($experiment_timeout);
+
+if ($status != 0)
+  {
+    print STDERR "ERROR: Supplier returned $status\n";
+    $Supplier->Kill ();
+    $Notification->Kill ();
+    $Naming->Kill ();
+    exit 1;
+  }
+
+$Supplier->Kill ();
+$Consumer->Kill ();
+$Relay->Kill ();
+
+unlink $consumer_ior;
+unlink $relay_ior;
+
+$Naming->Kill ();
+unlink $naming_ior;
+
+if ($#ARGV > -1)
+  {
+    $results_directory = $ARGV[0];
+    print STDERR "Saving results to $results_directory\n";
+
+    mkdir $results_directory, 0777;
+
+    @list=glob("*.dat");
+    for $file (@list)
+      {
+        copy ("$file", "$results_directory/$file");
+      }
+
+    @list=glob("*.conf");
+    for $file (@list)
+      {
+        copy ("$file", "$results_directory/$file");
+      }
+  }
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf
new file mode 100644
index 00000000000..d44991d0bd9
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/supplier.conf
@@ -0,0 +1,29 @@
+## $Id$
+## 
+
+##---- Load the Factories------
+dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+### --- Create Supplier s1 connected to sa1. -----
+#static Command_Builder "PeriodicSupplier -Create s_low -Direct c_low_relay -EventType L -Priority 1 -Period 0 -Iter 50000 -Load 1 -RunTime 40"
+
+### --- Create Supplier s2 connected to sa1 ----
+#static Command_Builder "PeriodicSupplier -Create s_med -Direct c_med_relay -EventType M -Priority 2 -Period 0 -Iter 50000 -Load 1 -RunTime 40"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Direct c_high_relay -EventType H -Priority 90 -Period 0 -Iter 50000 -Load 0 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -SignalPeer"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf
new file mode 100644
index 00000000000..d65da00875d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/consumer.conf
@@ -0,0 +1,34 @@
+## $Id$
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+
+dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##----------- Create an RT POA to host local consumer objects-----------
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 4 -Lane 1 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+
+##--------- Consumer 1 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_low -Direct -POA poa_1"
+
+##--------- Consumer 2 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_med -Direct -POA poa_1"
+
+##--------- Consumer 3 , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_high -Direct -POA poa_1"
+
+##------- Run---------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf
new file mode 100644
index 00000000000..b15e8ec7212
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/relay.conf
@@ -0,0 +1,35 @@
+## $Id$
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+
+dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##----------- Create an RT POA to host local consumer objects-----------
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 4 -Lane 1 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+
+##--------- Consumer 1 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_low_relay -Relay c_low -POA poa_1"
+
+##--------- Consumer 2 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_med_relay -Relay c_med -POA poa_1"
+
+##--------- Consumer 3 , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_high_relay -Relay c_high -POA poa_1"
+
+##------- Run---------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -SignalPeer"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl
new file mode 100755
index 00000000000..3fc76f501a0
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl
@@ -0,0 +1,117 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../../../../bin";
+use PerlACE::Run_Test;
+use File::Copy;
+
+$experiment_timeout = 60;
+$startup_timeout = 60;
+$naming_ior = PerlACE::LocalFile ("naming.ior");
+$consumer_ior = PerlACE::LocalFile ("consumer.ior");
+$relay_ior = PerlACE::LocalFile ("relay.ior");
+
+$supplier_conf = PerlACE::LocalFile ("supplier.conf");
+$consumer_conf = PerlACE::LocalFile ("consumer.conf");
+$relay_conf = PerlACE::LocalFile ("relay.conf");
+
+$status = 0;
+
+$Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service",
+                                "-o $naming_ior");
+
+$Supplier = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$relay_ior -ORBSvcConf $supplier_conf";
+
+$Consumer = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $consumer_ior -ORBSvcConf $consumer_conf";
+
+$Relay = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Relay_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $relay_ior -IORinput file://$consumer_ior -ORBSvcConf $relay_conf";
+
+unlink $naming_ior;
+$Naming->Spawn ();
+
+if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the naming service to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $consumer_ior;
+$Consumer->Arguments ($Consumer_Args);
+$args = $Consumer->Arguments ();
+print STDERR "Running Consumer with arguments: $args\n";
+$status = $Consumer->Spawn ();
+
+if (PerlACE::waitforfile_timed ($consumer_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the consumer to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $relay_ior;
+$Relay->Arguments ($Relay_Args);
+$args = $Relay->Arguments ();
+print STDERR "Running Relay with arguments: $args\n";
+$status = $Relay->Spawn ();
+
+if (PerlACE::waitforfile_timed ($relay_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the Relay to start\n";
+  $Consumer->Kill ();
+  $Naming->Kill ();
+  exit 1;
+}
+
+$Supplier->Arguments ($Supplier_Args);
+$args = $Supplier->Arguments ();
+print STDERR "Running Supplier with arguments: $args\n";
+$Supplier->SpawnWaitKill ($experiment_timeout);
+
+if ($status != 0)
+  {
+    print STDERR "ERROR: Supplier returned $status\n";
+    $Supplier->Kill ();
+    $Notification->Kill ();
+    $Naming->Kill ();
+    exit 1;
+  }
+
+$Supplier->Kill ();
+$Consumer->Kill ();
+$Relay->Kill ();
+
+unlink $consumer_ior;
+unlink $relay_ior;
+
+$Naming->Kill ();
+unlink $naming_ior;
+
+if ($#ARGV > -1)
+  {
+    $results_directory = $ARGV[0];
+    print STDERR "Saving results to $results_directory\n";
+
+    mkdir $results_directory, 0777;
+
+    @list=glob("*.dat");
+    for $file (@list)
+      {
+        copy ("$file", "$results_directory/$file");
+      }
+
+    @list=glob("*.conf");
+    for $file (@list)
+      {
+        copy ("$file", "$results_directory/$file");
+      }
+  }
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf
new file mode 100644
index 00000000000..5039bbb1f0b
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/supplier.conf
@@ -0,0 +1,33 @@
+## $Id$
+## This file has the following configuration:
+## 
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+### --- Create Supplier s1 connected to sa1. -----
+#static Command_Builder "PeriodicSupplier -Create s_low -Direct c_low_relay -EventType L -Priority 1 -Period 0 -Iter 50000 -Load 1 -RunTime 40"
+
+### --- Create Supplier s2 connected to sa1 ----
+#static Command_Builder "PeriodicSupplier -Create s_med -Direct c_med_relay -EventType M -Priority 2 -Period 0 -Iter 50000 -Load 1 -RunTime 40"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Direct c_high_relay -EventType H -Priority 90 -Period 0 -Iter 50000 -Load 0 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -SignalPeer"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
new file mode 100644
index 00000000000..6b919f91233
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
@@ -0,0 +1,45 @@
+#$Id$
+
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""         
+
+##---- Load the Factories------
+
+dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory COLOCATED"
+
+###
+###  Configure Supplier and Consumer for the High Priority Path 
+###
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa_high ec1 -AND_OP"
+
+### --- Create Supplier s_high connected to sa_high -----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa_high -EventType H -Priority 90 -Iter 50000 -Load 0 -RunTime 15"
+
+##--------- Consumer Admin 1 -------------
+static Command_Builder "ConsumerAdmin -Create ca_high ec1 -AND_OP"
+
+##--------- Consumer 1 , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_high -Admin ca_high"
+static Command_Builder "PeriodicConsumer -Subscription c_high +H"
+
+##--------- Run -------------
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
new file mode 100755
index 00000000000..855fbfb8b14
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
@@ -0,0 +1,69 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../../../../bin";
+use PerlACE::Run_Test;
+
+$experiment_timeout = 600;
+$startup_timeout = 60;
+$naming_ior = PerlACE::LocalFile ("naming.ior");
+$colocated_conf = PerlACE::LocalFile ("colocated.conf");
+$status = 0;
+
+$Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service",
+                                "-o $naming_ior");
+
+$Colocated = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Colocated_Args = "-ORBInitRef NameService=file://$naming_ior -ORBSvcConf $colocated_conf";
+
+unlink $naming_ior;
+$Naming->Spawn ();
+
+if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the naming service to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+$Colocated->Arguments ($Colocated_Args);
+$args = $Colocated->Arguments ();
+print STDERR "Running Colocated with arguments: $args\n";
+$status = $Colocated->SpawnWaitKill ($experiment_timeout);
+
+if ($status != 0)
+  {
+    print STDERR "ERROR: Colocated returned $status\n";
+    $Notification->Kill ();
+    $Naming->Kill ();
+    exit 1;
+  }
+
+$Naming->Kill ();
+unlink $naming_ior;
+
+if ($#ARGV > -1)
+  {
+    $results_directory = $ARGV[0];
+    print STDERR "Saving results to $results_directory\n";
+
+    mkdir $results_directory, 0777;
+
+    @list=glob("*.dat");
+    for $file (@list)
+      {
+        copy ("$file", "$results_directory/$file");
+      }
+
+    @list=glob("*.conf");
+    for $file (@list)
+      {
+        copy ("$file", "$results_directory/$file");
+      }
+  }
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
new file mode 100644
index 00000000000..1d6d6b10f49
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
@@ -0,0 +1,55 @@
+#$Id$
+
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"         
+
+dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () ""         
+
+dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""         
+
+##---- Load the Factories------
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+
+dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory COLOCATED"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 1 1 0 -Lane 90 1 0"
+
+##----------- Create an RT POA to host local consumer objects-----------
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -ThreadPoolLanes 2 -Lane 1 1 0 -Lane 90 1 0"
+
+###
+###  Configure Supplier and Consumer for the High Priority Path 
+###
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa_high ec1 -AND_OP"
+
+### --- Create Supplier s_high connected to sa_high -----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa_high -EventType H -Priority 90 -Iter 50000 -Load 0 -RunTime 15"
+
+##--------- Consumer Admin 1 -------------
+static Command_Builder "ConsumerAdmin -Create ca_high ec1 -AND_OP"
+
+##--------- Consumer 1 , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_high -Admin ca_high -POA poa_1"
+static Command_Builder "PeriodicConsumer -Subscription c_high +H"
+
+##--------- Run -------------
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.pl
new file mode 100644
index 00000000000..855fbfb8b14
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.pl
@@ -0,0 +1,69 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../../../../bin";
+use PerlACE::Run_Test;
+
+$experiment_timeout = 600;
+$startup_timeout = 60;
+$naming_ior = PerlACE::LocalFile ("naming.ior");
+$colocated_conf = PerlACE::LocalFile ("colocated.conf");
+$status = 0;
+
+$Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service",
+                                "-o $naming_ior");
+
+$Colocated = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Colocated_Args = "-ORBInitRef NameService=file://$naming_ior -ORBSvcConf $colocated_conf";
+
+unlink $naming_ior;
+$Naming->Spawn ();
+
+if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the naming service to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+$Colocated->Arguments ($Colocated_Args);
+$args = $Colocated->Arguments ();
+print STDERR "Running Colocated with arguments: $args\n";
+$status = $Colocated->SpawnWaitKill ($experiment_timeout);
+
+if ($status != 0)
+  {
+    print STDERR "ERROR: Colocated returned $status\n";
+    $Notification->Kill ();
+    $Naming->Kill ();
+    exit 1;
+  }
+
+$Naming->Kill ();
+unlink $naming_ior;
+
+if ($#ARGV > -1)
+  {
+    $results_directory = $ARGV[0];
+    print STDERR "Saving results to $results_directory\n";
+
+    mkdir $results_directory, 0777;
+
+    @list=glob("*.dat");
+    for $file (@list)
+      {
+        copy ("$file", "$results_directory/$file");
+      }
+
+    @list=glob("*.conf");
+    for $file (@list)
+      {
+        copy ("$file", "$results_directory/$file");
+      }
+  }
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
new file mode 100755
index 00000000000..855fbfb8b14
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
@@ -0,0 +1,69 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../../../../bin";
+use PerlACE::Run_Test;
+
+$experiment_timeout = 600;
+$startup_timeout = 60;
+$naming_ior = PerlACE::LocalFile ("naming.ior");
+$colocated_conf = PerlACE::LocalFile ("colocated.conf");
+$status = 0;
+
+$Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service",
+                                "-o $naming_ior");
+
+$Colocated = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Colocated_Args = "-ORBInitRef NameService=file://$naming_ior -ORBSvcConf $colocated_conf";
+
+unlink $naming_ior;
+$Naming->Spawn ();
+
+if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the naming service to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+$Colocated->Arguments ($Colocated_Args);
+$args = $Colocated->Arguments ();
+print STDERR "Running Colocated with arguments: $args\n";
+$status = $Colocated->SpawnWaitKill ($experiment_timeout);
+
+if ($status != 0)
+  {
+    print STDERR "ERROR: Colocated returned $status\n";
+    $Notification->Kill ();
+    $Naming->Kill ();
+    exit 1;
+  }
+
+$Naming->Kill ();
+unlink $naming_ior;
+
+if ($#ARGV > -1)
+  {
+    $results_directory = $ARGV[0];
+    print STDERR "Saving results to $results_directory\n";
+
+    mkdir $results_directory, 0777;
+
+    @list=glob("*.dat");
+    for $file (@list)
+      {
+        copy ("$file", "$results_directory/$file");
+      }
+
+    @list=glob("*.conf");
+    for $file (@list)
+      {
+        copy ("$file", "$results_directory/$file");
+      }
+  }
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf
new file mode 100644
index 00000000000..6cd28ac09aa
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/consumer.conf
@@ -0,0 +1,32 @@
+## $Id$
+##---- Load the Factories------
+dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+
+dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##--------- Consumer Admin 1 -------------
+static Command_Builder "ConsumerAdmin -Create ca1 ec1 -AND_OP"
+
+##--------- Consumer 1 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_low -Admin ca1"
+#static Command_Builder "PeriodicConsumer -Subscription c_low +L"
+
+##--------- Consumer 2 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_med -Admin ca1"
+#static Command_Builder "PeriodicConsumer -Subscription c_med +M"
+
+##--------- Consumer 3 , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_high -Admin ca1"
+static Command_Builder "PeriodicConsumer -Subscription c_high +H"
+
+##------- Run---------
+static Command_Builder "Application -SignalPeer"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
new file mode 100644
index 00000000000..b9b7b4b50cc
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
@@ -0,0 +1,2 @@
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""         
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
new file mode 100755
index 00000000000..2e9bbf4d9fb
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
@@ -0,0 +1,170 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../../../../bin";
+use PerlACE::Run_Test;
+use File::Copy;
+use Getopt::Std;
+
+# -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h
+getopts ("n:s:c:o:h");
+
+if ($opt_h)
+{
+    print STDERR "-n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h\n";
+    exit 0;
+}
+
+$experiment_timeout = 120;
+$startup_timeout = 120;
+
+if ($opt_n)
+{
+    $notify_conf = PerlACE::LocalFile ($opt_n);
+
+}else
+{
+    $notify_conf = PerlACE::LocalFile ("notify.conf");
+}
+
+if ($opt_s)
+{
+    $supplier_conf = PerlACE::LocalFile ($opt_s);
+
+}else
+{
+    $supplier_conf = PerlACE::LocalFile ("supplier.conf");
+}
+
+if ($opt_c)
+{
+    $consumer_conf = PerlACE::LocalFile ($opt_c);
+
+}else
+{
+    $consumer_conf = PerlACE::LocalFile ("consumer.conf");
+}
+
+$notify_ior = PerlACE::LocalFile ("notify.ior");
+
+$naming_ior = PerlACE::LocalFile ("naming.ior");
+
+$supplier_ior = PerlACE::LocalFile ("supplier.ior");
+
+@list=glob("*.dat");
+for $file (@list)
+{
+  unlink $file or die "Could not delete $file";
+}
+
+$status = 0;
+
+$Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service",
+                                "-o $naming_ior");
+
+$Notification = new PerlACE::Process ("../../../../../../Notify_Service/Notify_Service");
+
+#$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf -ORBDebugLevel 1";
+
+$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf";
+
+$Supplier = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf";
+
+$Consumer = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf";
+#$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1";
+
+unlink $naming_ior;
+$Naming->Spawn ();
+
+if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the naming service to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $notify_ior;
+$Notification->Arguments ($Notify_Args);
+$args = $Notification->Arguments ();
+print STDERR "Running Notification with arguments: $args\n";
+$Notification->Spawn ();
+
+if (PerlACE::waitforfile_timed ($notify_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the notify service to start\n";
+  $Notification->Kill ();
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $supplier_ior;
+$Supplier->Arguments ($Supplier_Args);
+$args = $Supplier->Arguments ();
+print STDERR "Running Supplier with arguments: $args\n";
+$Supplier->Spawn ();
+
+if (PerlACE::waitforfile_timed ($supplier_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the supplier to start\n";
+  $Supplier->Kill ();
+  $Notification->Kill ();
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $consumer_ior;
+$Consumer->Arguments ($Consumer_Args);
+$args = $Consumer->Arguments ();
+print STDERR "Running Consumer with arguments: $args\n";
+$status = $Consumer->SpawnWaitKill ($experiment_timeout);
+
+if ($status != 0)
+  {
+    print STDERR "ERROR: Consumer returned $status\n";
+    $Supplier->Kill ();
+    $Notification->Kill ();
+    $Naming->Kill ();
+    exit 1;
+  }
+
+unlink $consumer_ior;
+
+$Supplier->Kill ();
+unlink $supplier_ior;
+
+$Notification->Kill ();
+unlink $notify_ior;
+
+$Naming->Kill ();
+unlink $naming_ior;
+
+if ($opt_o)
+  {
+      $results_directory = PerlACE::LocalFile ($opt_o);
+
+      if (! -e $results_directory)
+      {
+          mkdir $results_directory, 0777;
+      }
+
+      print STDERR "Saving results to $results_directory\n";
+
+      @list=glob("*.dat");
+      for $file (@list)
+      {
+          copy ("$file", "$results_directory/$file");
+      }
+
+      @list=glob("*.conf");
+      for $file (@list)
+      {
+          copy ("$file", "$results_directory/$file");
+      }
+  }
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf
new file mode 100644
index 00000000000..4f5b6b6da36
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/supplier.conf
@@ -0,0 +1,37 @@
+## $Id$
+## 
+
+##---- Load the Factories------
+dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s1 connected to sa1. -----
+#static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 30 -RunTime 15"
+
+### --- Create Supplier s2 connected to sa1 ----
+#static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 30 -RunTime 15"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 0 -Iter 50000 -Load 0 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf
new file mode 100644
index 00000000000..9a36f37dea7
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/consumer.conf
@@ -0,0 +1,39 @@
+## $Id$
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_ConsumerAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Consumer_Command_Factory () ""
+
+dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_NS_RT_POA_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##----------- Create an RT POA to host local consumer objects-----------
+static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+##--------- Consumer Admin 1 -------------
+static Command_Builder "ConsumerAdmin -Create ca1 ec1 -AND_OP"
+
+##--------- Consumer 1 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_low -Admin ca1 -POA poa_1"
+#static Command_Builder "PeriodicConsumer -Subscription c_low +L"
+
+##--------- Consumer 2 , connected to CA 1 --------
+#static Command_Builder "PeriodicConsumer -Create c_med -Admin ca1 -POA poa_1"
+#static Command_Builder "PeriodicConsumer -Subscription c_med +M"
+
+##--------- Consumer 3 , connected to CA 1 --------
+static Command_Builder "PeriodicConsumer -Create c_high -Admin ca1 -POA poa_1"
+static Command_Builder "PeriodicConsumer -Subscription c_high +H"
+
+##------- Run---------
+static Command_Builder "Application -SignalPeer"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
new file mode 100644
index 00000000000..c2c8a049a4b
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
@@ -0,0 +1,4 @@
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"         
+dynamic TAO_NS_Factory Service_Object * TAO_CosNotification:_make_TAO_NS_Default_Factory () ""         
+dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""         
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
new file mode 100755
index 00000000000..2e9bbf4d9fb
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
@@ -0,0 +1,170 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../../../../bin";
+use PerlACE::Run_Test;
+use File::Copy;
+use Getopt::Std;
+
+# -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h
+getopts ("n:s:c:o:h");
+
+if ($opt_h)
+{
+    print STDERR "-n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h\n";
+    exit 0;
+}
+
+$experiment_timeout = 120;
+$startup_timeout = 120;
+
+if ($opt_n)
+{
+    $notify_conf = PerlACE::LocalFile ($opt_n);
+
+}else
+{
+    $notify_conf = PerlACE::LocalFile ("notify.conf");
+}
+
+if ($opt_s)
+{
+    $supplier_conf = PerlACE::LocalFile ($opt_s);
+
+}else
+{
+    $supplier_conf = PerlACE::LocalFile ("supplier.conf");
+}
+
+if ($opt_c)
+{
+    $consumer_conf = PerlACE::LocalFile ($opt_c);
+
+}else
+{
+    $consumer_conf = PerlACE::LocalFile ("consumer.conf");
+}
+
+$notify_ior = PerlACE::LocalFile ("notify.ior");
+
+$naming_ior = PerlACE::LocalFile ("naming.ior");
+
+$supplier_ior = PerlACE::LocalFile ("supplier.ior");
+
+@list=glob("*.dat");
+for $file (@list)
+{
+  unlink $file or die "Could not delete $file";
+}
+
+$status = 0;
+
+$Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service",
+                                "-o $naming_ior");
+
+$Notification = new PerlACE::Process ("../../../../../../Notify_Service/Notify_Service");
+
+#$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf -ORBDebugLevel 1";
+
+$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf";
+
+$Supplier = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf";
+
+$Consumer = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+
+$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf";
+#$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1";
+
+unlink $naming_ior;
+$Naming->Spawn ();
+
+if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the naming service to start\n";
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $notify_ior;
+$Notification->Arguments ($Notify_Args);
+$args = $Notification->Arguments ();
+print STDERR "Running Notification with arguments: $args\n";
+$Notification->Spawn ();
+
+if (PerlACE::waitforfile_timed ($notify_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the notify service to start\n";
+  $Notification->Kill ();
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $supplier_ior;
+$Supplier->Arguments ($Supplier_Args);
+$args = $Supplier->Arguments ();
+print STDERR "Running Supplier with arguments: $args\n";
+$Supplier->Spawn ();
+
+if (PerlACE::waitforfile_timed ($supplier_ior, $startup_timeout) == -1) {
+  print STDERR "ERROR: waiting for the supplier to start\n";
+  $Supplier->Kill ();
+  $Notification->Kill ();
+  $Naming->Kill ();
+  exit 1;
+}
+
+unlink $consumer_ior;
+$Consumer->Arguments ($Consumer_Args);
+$args = $Consumer->Arguments ();
+print STDERR "Running Consumer with arguments: $args\n";
+$status = $Consumer->SpawnWaitKill ($experiment_timeout);
+
+if ($status != 0)
+  {
+    print STDERR "ERROR: Consumer returned $status\n";
+    $Supplier->Kill ();
+    $Notification->Kill ();
+    $Naming->Kill ();
+    exit 1;
+  }
+
+unlink $consumer_ior;
+
+$Supplier->Kill ();
+unlink $supplier_ior;
+
+$Notification->Kill ();
+unlink $notify_ior;
+
+$Naming->Kill ();
+unlink $naming_ior;
+
+if ($opt_o)
+  {
+      $results_directory = PerlACE::LocalFile ($opt_o);
+
+      if (! -e $results_directory)
+      {
+          mkdir $results_directory, 0777;
+      }
+
+      print STDERR "Saving results to $results_directory\n";
+
+      @list=glob("*.dat");
+      for $file (@list)
+      {
+          copy ("$file", "$results_directory/$file");
+      }
+
+      @list=glob("*.conf");
+      for $file (@list)
+      {
+          copy ("$file", "$results_directory/$file");
+      }
+  }
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf
new file mode 100644
index 00000000000..a81ae0ebc66
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/supplier.conf
@@ -0,0 +1,48 @@
+## $Id$
+## This file has the following configuration:
+## EventChannel ec1 with 1 Thread
+## SupplierAdmim sa1 with 1 Thread
+## SupplierAdmin sa2
+## 
+## Supplier s1 has 1 Thread and is connected to sa1
+## Supplier s2 is connected to sa1
+## 
+## Supplier s3 is connected to sa2
+## 
+
+##---- Load the Factories------
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
+
+dynamic TAO_NS_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_NS_RT_Application_Command_Factory () ""
+##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_NS_Application_Command_Factory () ""
+dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_NS_EventChannel_Command_Factory () ""
+dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+
+dynamic TAO_NS_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
+
+##------- Init the Application Object ----------
+static Command_Builder "Application -Init"
+
+##------- Create Event Channel ---------------
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
+static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 5 -Lane 1 1 0 -Lane 50 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
+
+### --- Create Supplier Admin 1 ----
+static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
+
+### --- Create Supplier s1 connected to sa1. -----
+#static Command_Builder "PeriodicSupplier -Create s_low -Admin sa1 -EventType L -Priority 20 -Period 10000 -Iter 50000 -Load 30 -RunTime 15"
+
+### --- Create Supplier s2 connected to sa1 ----
+#static Command_Builder "PeriodicSupplier -Create s_med -Admin sa1 -EventType M -Priority 60 -Period 10000 -Iter 50000 -Load 30 -RunTime 15"
+
+### --- Create Supplier s3 connected to sa1 ----
+static Command_Builder "PeriodicSupplier -Create s_high -Admin sa1 -EventType H -Priority 90 -Period 0 -Iter 5 -Load 0 -RunTime 15"
+
+##--------- Run -------------
+static Command_Builder "Application -WaitToStart"
+static Command_Builder "Application -Run"
+static Command_Builder "Application -WaitForEvents"
+static Command_Builder "Application -DumpStats"
+static Command_Builder "Application -Shutdown"
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README
new file mode 100644
index 00000000000..a0195aac85b
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README
@@ -0,0 +1,22 @@
+//$Id$
+
+To calculate the Maximum throughput possible, a supplier thread sends 
+events in a burst to a consumer.
+
+This test runs the following configurations:
+Note that the payload is identical in all configurations.
+
+1. 2 Hops    : A supplier sends events directly to a consumer.
+2. 3 Hops    : A supplier sends events to a relay consumer
+	       onto the final consummer.
+3. Notify    : A supplier sends events via Cos Notification to a consumer.
+
+4. Colocated : A supplier sends events via a colocated 
+	       RT Notification to a consumer.
+
+The RTCORBA enabled versions of these tests are:
+
+2_Hops_RTCORBA  
+3_Hops_RTCORBA     
+Notify_RTCORBA  
+Colocated_RTCORBA  
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/run_all.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/run_all.pl
new file mode 100755
index 00000000000..2778d876708
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/run_all.pl
@@ -0,0 +1,36 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "../../../../../../../bin";
+use PerlACE::Run_Test;
+use File::Copy;
+use Getopt::Std;
+
+@list=glob("*");
+
+for $file (@list)
+{
+    print STDERR "found $file test\n";
+
+    if (-d $file)
+    {
+        print STDERR "Running $file test\n";
+
+        $cmd = "run_test.pl";
+
+        chdir $file or die "Could not chdir to $file";
+
+        $status = system ("perl $cmd");
+
+        if ($status != 0)
+        {
+            print STDERR "ERROR: $file test returned $status\n";
+        }
+
+        chdir "../";
+    }
+}