ChangeLogTag: Thu Apr 10 07:06:07 2003 Pradeep Gore <pradeep@oomworks.com>

7 files changed, 414 insertions, 19 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6d5c8cb729b..8e3fbcf5c6f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Thu Apr 10 07:06:07 2003 Pradeep Gore <pradeep@oomworks.com>
+
+	* orbsvcs/tests/Notify/RT_lib/Makefile:
+	* orbsvcs/tests/Notify/Test_Filter/Makefile:
+	  Added missing linkage to RTCORBA.
+
+	* orbsvcs/tests/Notify/ThreadPool/supplier.conf:
+	  Corrected the names of the library loaded.
+
+	* orbsvcs/orbsvcs/.depend.Makefile.RT_Notification:
+	* orbsvcs/orbsvcs/Makefile.RT_Notification:
+	  Added missing Structured/RT_StructuredProxyPushSupplier.cpp
+
+	* orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+	  Corrected ENV usage.
+
 Thu Apr 10 15:01:18 2003  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * docs/Options.html:
diff --git a/TAO/orbsvcs/orbsvcs/.depend.Makefile.RT_Notification b/TAO/orbsvcs/orbsvcs/.depend.Makefile.RT_Notification
index bce9a633ec8..de2f27997d8 100644
--- a/TAO/orbsvcs/orbsvcs/.depend.Makefile.RT_Notification
+++ b/TAO/orbsvcs/orbsvcs/.depend.Makefile.RT_Notification
@@ -1473,4 +1473,357 @@
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
   Notify/RT_Properties.inl
 
+.obj/RT_StructuredProxyPushSupplier.o .obj/RT_StructuredProxyPushSupplier.so .shobj/RT_StructuredProxyPushSupplier.o .shobj/RT_StructuredProxyPushSupplier.so:  \
+ Notify/Structured/RT_StructuredProxyPushSupplier.cpp \
+  Notify/Structured/RT_StructuredProxyPushSupplier.h \
+  $(ACE_ROOT)/ace/pre.h \
+  Notify/rt_notify_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  Notify/Structured/StructuredProxyPushSupplier.h Notify/notify_export.h \
+  ../../orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \
+  ../../orbsvcs/orbsvcs/CosNotificationS.h \
+  ../../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/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/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/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/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/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 \
+  $(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/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/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_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/varbase.h \
+  $(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/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(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/Encodable.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.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 \
+  ../../orbsvcs/orbsvcs/Notify/notify_export.h \
+  ../../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 \
+  ../../orbsvcs/orbsvcs/CosNotificationS_T.h \
+  ../../orbsvcs/orbsvcs/CosNotificationS_T.i \
+  ../../orbsvcs/orbsvcs/CosNotificationS_T.cpp \
+  ../../orbsvcs/orbsvcs/CosNotificationS.i \
+  ../../orbsvcs/orbsvcs/CosNotifyFilterS.h \
+  ../../orbsvcs/orbsvcs/CosNotifyCommS.h \
+  ../../orbsvcs/orbsvcs/CosEventCommS.h \
+  ../../orbsvcs/orbsvcs/CosEventCommC.h \
+  ../../orbsvcs/orbsvcs/CosEventCommC.i \
+  ../../orbsvcs/orbsvcs/CosEventCommS_T.h \
+  ../../orbsvcs/orbsvcs/CosEventCommS_T.i \
+  ../../orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+  ../../orbsvcs/orbsvcs/CosEventCommS.i \
+  ../../orbsvcs/orbsvcs/CosNotifyCommC.h \
+  ../../orbsvcs/orbsvcs/CosNotifyCommC.i \
+  ../../orbsvcs/orbsvcs/CosNotifyCommS_T.h \
+  ../../orbsvcs/orbsvcs/CosNotifyCommS_T.i \
+  ../../orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \
+  ../../orbsvcs/orbsvcs/CosNotifyCommS.i \
+  ../../orbsvcs/orbsvcs/CosNotifyFilterC.h \
+  ../../orbsvcs/orbsvcs/CosNotifyFilterC.i \
+  ../../orbsvcs/orbsvcs/CosNotifyFilterS_T.h \
+  ../../orbsvcs/orbsvcs/CosNotifyFilterS_T.i \
+  ../../orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \
+  ../../orbsvcs/orbsvcs/CosNotifyFilterS.i \
+  ../../orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  ../../orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+  ../../orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+  ../../orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+  ../../orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+  ../../orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+  ../../orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+  ../../orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \
+  ../../orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \
+  ../../orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \
+  ../../orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \
+  ../../orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \
+  ../../orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \
+  ../../orbsvcs/orbsvcs/Event_ForwarderS.h \
+  ../../orbsvcs/orbsvcs/Event_ForwarderC.h \
+  ../../orbsvcs/orbsvcs/Event_ForwarderC.i \
+  ../../orbsvcs/orbsvcs/Event_ForwarderS_T.h \
+  ../../orbsvcs/orbsvcs/Event_ForwarderS_T.i \
+  ../../orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \
+  ../../orbsvcs/orbsvcs/Event_ForwarderS.i Notify/ProxySupplier_T.h \
+  Notify/Proxy_T.h Notify/Proxy.h Notify/Object.h \
+  ../../orbsvcs/orbsvcs/NotifyExtC.h ../../orbsvcs/orbsvcs/NotifyExtC.i \
+  Notify/QoSProperties.h Notify/PropertySeq.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  Notify/PropertySeq.inl Notify/Property_T.h Notify/Property_T.inl \
+  Notify/Property_T.cpp Notify/Property_Boolean.h \
+  Notify/Property_Boolean.inl Notify/Property.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  Notify/QoSProperties.inl Notify/AdminProperties.h \
+  $(ACE_ROOT)/ace/Refcounted_Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Refcounted_Auto_Ptr.i \
+  Notify/AdminProperties.inl Notify/Refcountable.h \
+  Notify/Refcountable.inl Notify/Object.inl Notify/EventTypeSeq.h \
+  Notify/EventType.h Notify/EventType.inl Notify/EventTypeSeq.inl \
+  Notify/FilterAdmin.h Notify/ID_Factory.h Notify/ID_Factory.inl \
+  Notify/Event.h \
+  $(ACE_ROOT)/ace/Copy_Disabled.h \
+  Notify/Event.inl Notify/Admin.h Notify/Admin.inl Notify/Proxy.inl \
+  Notify/Proxy_T.inl Notify/Proxy_T.cpp Notify/ProxySupplier.h \
+  Notify/ProxySupplier.inl Notify/ProxySupplier_T.inl \
+  Notify/ProxySupplier_T.cpp Notify/Consumer.h Notify/Peer.h \
+  Notify/Peer.inl Notify/Consumer.inl Notify/Structured/StructuredEvent.h \
+  Notify/Structured/StructuredEvent.inl Notify/Any/AnyEvent.h \
+  Notify/Any/AnyEvent.inl Notify/Method_Request_Dispatch.h \
+  Notify/Method_Request.h Notify/Method_Request.inl \
+  Notify/Method_Request_Dispatch.inl \
+  Notify/Method_Request_Dispatch_No_Filtering.h \
+  Notify/Method_Request_Dispatch_No_Filtering.inl Notify/Worker_Task.h \
+  Notify/Worker_Task.inl Notify/Event_Manager.h \
+  ../../orbsvcs/orbsvcs/ESF/ESF_Worker.h \
+  ../../orbsvcs/orbsvcs/ESF/ESF_Worker.i \
+  ../../orbsvcs/orbsvcs/ESF/ESF_Worker.cpp Notify/Event_Manager.inl \
+  Notify/ProxyConsumer.h Notify/ProxyConsumer.inl Notify/Event_Map_T.h \
+  Notify/Event_Map_Entry_T.h Notify/Event_Map_Entry_T.inl \
+  Notify/Event_Map_Entry_T.cpp \
+  ../../orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \
+  ../../orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \
+  ../../orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp Notify/Properties.h \
+  Notify/Properties.inl Notify/Factory.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 \
+  Notify/Event_Map_T.inl Notify/Event_Map_T.cpp Notify/ConsumerAdmin.h \
+  ../../orbsvcs/orbsvcs/NotifyExtS.h ../../orbsvcs/orbsvcs/NotifyExtS_T.h \
+  ../../orbsvcs/orbsvcs/NotifyExtS_T.i \
+  ../../orbsvcs/orbsvcs/NotifyExtS_T.cpp \
+  ../../orbsvcs/orbsvcs/NotifyExtS.i Notify/ConsumerAdmin.inl \
+  Notify/Structured/StructuredProxyPushSupplier.inl \
+  Notify/Structured/RT_StructuredProxyPushSupplier.inl
+
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RT_Notification b/TAO/orbsvcs/orbsvcs/Makefile.RT_Notification
index c36eb27faaf..404addf7304 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.RT_Notification
+++ b/TAO/orbsvcs/orbsvcs/Makefile.RT_Notification
@@ -17,7 +17,8 @@ RT_Notify = \
   Notify/RT_Factory \
   Notify/RT_Notify_Service \
   Notify/RT_POA_Helper \
-  Notify/RT_Properties
+  Notify/RT_Properties \
+  Notify/Structured/RT_StructuredProxyPushSupplier \
 
 ifndef ORBSVCS_COMPONENTS
   ORBSVCS_COMPONENTS = \
@@ -28,7 +29,7 @@ ifneq (,$(findstring RT_Notify, $(ORBSVCS_COMPONENTS)))
   FILES += $(RT_Notify)
 endif # RT_Notify
 
-VPATH = .:Notify
+VPATH = .:Notify:Notify/Structured
 
 ifeq (,$(TAO_ORBSVCS))
 LIB   = $(LIB_UNCHECKED)
@@ -89,4 +90,3 @@ ORBSVCS_COMPONENTS:
 
 compclean:
 	@sh $(ACE_ROOT)/bin/ace_components --orbsvcs --remove
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index 1129cf9c763..65fcee019a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -19,7 +19,7 @@ TAO_NS_RT_StructuredProxyPushSupplier::~TAO_NS_RT_StructuredProxyPushSupplier ()
 CORBA::Object_ptr
 TAO_NS_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
 {
-  CORBA::Object_var object = TAO_NS_Proxy::activate (servant ACE_ENV_ARG_DECL);
+  CORBA::Object_var object = TAO_NS_Proxy::activate (servant ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Obtain our ref.
@@ -34,11 +34,37 @@ TAO_NS_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant
 void
 TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event_var &event)
 {
-  event->push (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER);
+  ACE_TRY_NEW_ENV
+    {
+      event->push (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      if (TAO_debug_level > 2)
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) TAO_NS_RT_StructuredProxyPushSupplier::push failed\n");
+        }
+
+    }
+  ACE_ENDTRY;
 }
 
 void
 TAO_NS_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_NS_Event_var &event)
 {
-  event->push_no_filtering (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER);
+  ACE_TRY_NEW_ENV
+    {
+      event->push_no_filtering (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      if (TAO_debug_level > 2)
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) TAO_NS_RT_StructuredProxyPushSupplier::push failed\n");
+        }
+
+    }
+  ACE_ENDTRY;
 }
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile
index 3ed31e9ffb0..48c54472a27 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile
@@ -57,10 +57,10 @@ 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
+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 $(ACELIB)
+ACE_SHLIBS = -lTAO_RTCORBA -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO $(ACELIB)
 
 #----------------------------------------------------------------------------
 #       Local targets
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile
index 77974b77b1a..5ed8a29e408 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile
@@ -58,7 +58,7 @@ 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 $(ACELIB)
+ACE_SHLIBS = -lTAO_RTCORBA -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO $(ACELIB)
 
 #----------------------------------------------------------------------------
 #       Local targets
diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/supplier.conf b/TAO/orbsvcs/tests/Notify/ThreadPool/supplier.conf
index 0c8ef84a5f1..b9ffe13d970 100644
--- a/TAO/orbsvcs/tests/Notify/ThreadPool/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/ThreadPool/supplier.conf
@@ -3,23 +3,23 @@
 ## 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_RTCORBAd:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
+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_NotifyTestsd:_make_TAO_NS_RT_Application_Command_Factory () ""
-##dynamic TAO_NS_Application_Command_Factory Service_Object * TAO_NotifyTestsd:_make_TAO_NS_Application_Command_Factory () ""
-dynamic TAO_NS_EventChannel_Command_Factory Service_Object *TAO_NotifyTestsd:_make_TAO_NS_EventChannel_Command_Factory () ""
-dynamic TAO_NS_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTestsd:_make_TAO_NS_SupplierAdmin_Command_Factory () ""
+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_NotifyTestsd:_make_TAO_NS_Periodic_Supplier_Command_Factory () ""
-dynamic TAO_NS_Filter_Command_Factory Service_Object* TAO_NotifyTestsd:_make_TAO_NS_Filter_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 () ""
 
 ##------- Init the Application Object ----------
 static Command_Builder "Application -Init"