ChangeLogTag: Mon Sep 17 19:00:00 2001 Irfan Pyarali <irfan@cs.wustl.edu>

1 files changed, 375 insertions, 375 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
index b949b40662a..ee66cea3765 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
@@ -94,9 +94,9 @@ realclean: clean
 .obj/CEC_ConsumerAdmin.o .obj/CEC_ConsumerAdmin.so .shobj/CEC_ConsumerAdmin.o .shobj/CEC_ConsumerAdmin.so: CosEvent/CEC_ConsumerAdmin.cpp \
   CosEvent/CEC_ConsumerAdmin.h \
   $(ACE_ROOT)/ace/pre.h \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
-  CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -281,8 +281,8 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  CosEvent/event_export.h \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -294,28 +294,28 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
-  ESF/ESF_Proxy_Admin.h \
-  ESF/ESF_Proxy_Collection.h \
-  ESF/ESF_Proxy_Collection.i \
-  ESF/ESF_Proxy_Collection.cpp \
-  ESF/ESF_Worker.h \
-  ESF/ESF_Worker.i \
-  ESF/ESF_Worker.cpp \
-  ESF/ESF_Proxy_Admin.i \
-  ESF/ESF_Proxy_Admin.cpp \
-  ESF/ESF_Shutdown_Proxy.h \
-  ESF/ESF_Shutdown_Proxy.i \
-  ESF/ESF_Shutdown_Proxy.cpp \
+  $(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/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/ESF/ESF_Proxy_Admin.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \
   CosEvent/CEC_ProxyPushSupplier.h CosEvent/event_export.h \
   CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_ProxyPullSupplier.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
@@ -389,7 +389,7 @@ realclean: clean
 .obj/CEC_ConsumerControl.o .obj/CEC_ConsumerControl.so .shobj/CEC_ConsumerControl.o .shobj/CEC_ConsumerControl.so: CosEvent/CEC_ConsumerControl.cpp \
   CosEvent/CEC_ConsumerControl.h \
   $(ACE_ROOT)/ace/pre.h \
-  CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -579,7 +579,7 @@ realclean: clean
 .obj/CEC_Dispatching.o .obj/CEC_Dispatching.so .shobj/CEC_Dispatching.o .shobj/CEC_Dispatching.so: CosEvent/CEC_Dispatching.cpp \
   CosEvent/CEC_Dispatching.h \
   $(ACE_ROOT)/ace/pre.h \
-  CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -764,12 +764,12 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  CosEvent/event_export.h \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   CosEvent/event_export.h CosEvent/CEC_Dispatching.i \
   CosEvent/CEC_ProxyPushSupplier.h \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -781,16 +781,16 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
+  $(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/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 \
   CosEvent/CEC_ProxyPushSupplier.i
 
 .obj/CEC_EventChannel.o .obj/CEC_EventChannel.so .shobj/CEC_EventChannel.o .shobj/CEC_EventChannel.so: CosEvent/CEC_EventChannel.cpp \
@@ -986,11 +986,11 @@ realclean: clean
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
   CosEvent/CEC_Factory.i \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
-  CosEventCommC.h \
-  CosEvent/event_export.h \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.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)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -1002,32 +1002,32 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
+  $(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/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 \
   CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \
   CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \
   CosEvent/CEC_Pulling_Strategy.h CosEvent/CEC_Pulling_Strategy.i \
   CosEvent/CEC_ConsumerAdmin.h \
-  ESF/ESF_Proxy_Admin.h \
-  ESF/ESF_Proxy_Collection.h \
-  ESF/ESF_Proxy_Collection.i \
-  ESF/ESF_Proxy_Collection.cpp \
-  ESF/ESF_Worker.h \
-  ESF/ESF_Worker.i \
-  ESF/ESF_Worker.cpp \
-  ESF/ESF_Proxy_Admin.i \
-  ESF/ESF_Proxy_Admin.cpp \
-  ESF/ESF_Shutdown_Proxy.h \
-  ESF/ESF_Shutdown_Proxy.i \
-  ESF/ESF_Shutdown_Proxy.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \
   CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \
   CosEvent/CEC_ProxyPullSupplier.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1299,9 +1299,9 @@ realclean: clean
 .obj/CEC_ProxyPushConsumer.o .obj/CEC_ProxyPushConsumer.so .shobj/CEC_ProxyPushConsumer.o .shobj/CEC_ProxyPushConsumer.so: CosEvent/CEC_ProxyPushConsumer.cpp \
   CosEvent/CEC_ProxyPushConsumer.h \
   $(ACE_ROOT)/ace/pre.h \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
-  CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -1486,8 +1486,8 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  CosEvent/event_export.h \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -1499,20 +1499,20 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
+  $(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/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 \
   CosEvent/event_export.h \
-  ESF/ESF_Worker.h \
-  ESF/ESF_Worker.i \
-  ESF/ESF_Worker.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \
   CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_EventChannel.h \
   CosEvent/CEC_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -1521,15 +1521,15 @@ realclean: clean
   $(ACE_ROOT)/ace/Service_Object.i \
   CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
   CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerAdmin.h \
-  ESF/ESF_Proxy_Admin.h \
-  ESF/ESF_Proxy_Collection.h \
-  ESF/ESF_Proxy_Collection.i \
-  ESF/ESF_Proxy_Collection.cpp \
-  ESF/ESF_Proxy_Admin.i \
-  ESF/ESF_Proxy_Admin.cpp \
-  ESF/ESF_Shutdown_Proxy.h \
-  ESF/ESF_Shutdown_Proxy.i \
-  ESF/ESF_Shutdown_Proxy.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \
   CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \
   CosEvent/CEC_ProxyPullSupplier.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1595,9 +1595,9 @@ realclean: clean
 .obj/CEC_ProxyPullConsumer.o .obj/CEC_ProxyPullConsumer.so .shobj/CEC_ProxyPullConsumer.o .shobj/CEC_ProxyPullConsumer.so: CosEvent/CEC_ProxyPullConsumer.cpp \
   CosEvent/CEC_ProxyPullConsumer.h \
   $(ACE_ROOT)/ace/pre.h \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
-  CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -1782,8 +1782,8 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  CosEvent/event_export.h \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -1795,19 +1795,19 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
-  ESF/ESF_Worker.h \
-  ESF/ESF_Worker.i \
-  ESF/ESF_Worker.cpp \
+  $(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/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/ESF/ESF_Worker.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \
   CosEvent/event_export.h CosEvent/CEC_ProxyPullConsumer.i \
   CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -1816,15 +1816,15 @@ realclean: clean
   $(ACE_ROOT)/ace/Service_Object.i \
   CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
   CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerAdmin.h \
-  ESF/ESF_Proxy_Admin.h \
-  ESF/ESF_Proxy_Collection.h \
-  ESF/ESF_Proxy_Collection.i \
-  ESF/ESF_Proxy_Collection.cpp \
-  ESF/ESF_Proxy_Admin.i \
-  ESF/ESF_Proxy_Admin.cpp \
-  ESF/ESF_Shutdown_Proxy.h \
-  ESF/ESF_Shutdown_Proxy.i \
-  ESF/ESF_Shutdown_Proxy.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \
   CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \
   CosEvent/CEC_ProxyPullSupplier.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1891,9 +1891,9 @@ realclean: clean
 .obj/CEC_ProxyPushSupplier.o .obj/CEC_ProxyPushSupplier.so .shobj/CEC_ProxyPushSupplier.o .shobj/CEC_ProxyPushSupplier.so: CosEvent/CEC_ProxyPushSupplier.cpp \
   CosEvent/CEC_ProxyPushSupplier.h \
   $(ACE_ROOT)/ace/pre.h \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
-  CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -2078,8 +2078,8 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  CosEvent/event_export.h \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -2091,16 +2091,16 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
+  $(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/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 \
   CosEvent/event_export.h CosEvent/CEC_ProxyPushSupplier.i \
   CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \
   CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \
@@ -2111,19 +2111,19 @@ realclean: clean
   CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
   CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerControl.h \
   CosEvent/CEC_ConsumerControl.i \
-  ESF/ESF_RefCount_Guard.h \
-  ESF/ESF_RefCount_Guard.i \
-  ESF/ESF_RefCount_Guard.cpp \
-  ESF/ESF_Proxy_RefCount_Guard.h \
-  ESF/ESF_Proxy_RefCount_Guard.i \
-  ESF/ESF_Proxy_RefCount_Guard.cpp
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
 
 .obj/CEC_ProxyPullSupplier.o .obj/CEC_ProxyPullSupplier.so .shobj/CEC_ProxyPullSupplier.o .shobj/CEC_ProxyPullSupplier.so: CosEvent/CEC_ProxyPullSupplier.cpp \
   CosEvent/CEC_ProxyPullSupplier.h \
   $(ACE_ROOT)/ace/pre.h \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
-  CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -2308,8 +2308,8 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  CosEvent/event_export.h \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -2321,16 +2321,16 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
+  $(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/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 \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
@@ -2402,9 +2402,9 @@ realclean: clean
 .obj/CEC_SupplierAdmin.o .obj/CEC_SupplierAdmin.so .shobj/CEC_SupplierAdmin.o .shobj/CEC_SupplierAdmin.so: CosEvent/CEC_SupplierAdmin.cpp \
   CosEvent/CEC_SupplierAdmin.h \
   $(ACE_ROOT)/ace/pre.h \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
-  CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -2589,8 +2589,8 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  CosEvent/event_export.h \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -2602,28 +2602,28 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
-  ESF/ESF_Proxy_Admin.h \
-  ESF/ESF_Proxy_Collection.h \
-  ESF/ESF_Proxy_Collection.i \
-  ESF/ESF_Proxy_Collection.cpp \
-  ESF/ESF_Worker.h \
-  ESF/ESF_Worker.i \
-  ESF/ESF_Worker.cpp \
-  ESF/ESF_Proxy_Admin.i \
-  ESF/ESF_Proxy_Admin.cpp \
-  ESF/ESF_Shutdown_Proxy.h \
-  ESF/ESF_Shutdown_Proxy.i \
-  ESF/ESF_Shutdown_Proxy.cpp \
+  $(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/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/ESF/ESF_Proxy_Admin.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \
   CosEvent/CEC_ProxyPushConsumer.h CosEvent/event_export.h \
   CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_ProxyPullConsumer.h \
   CosEvent/CEC_ProxyPullConsumer.i CosEvent/CEC_SupplierAdmin.i \
@@ -2638,7 +2638,7 @@ realclean: clean
 .obj/CEC_SupplierControl.o .obj/CEC_SupplierControl.so .shobj/CEC_SupplierControl.o .shobj/CEC_SupplierControl.so: CosEvent/CEC_SupplierControl.cpp \
   CosEvent/CEC_SupplierControl.h \
   $(ACE_ROOT)/ace/pre.h \
-  CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -2996,11 +2996,11 @@ realclean: clean
   $(ACE_ROOT)/ace/Module.cpp \
   $(ACE_ROOT)/ace/Stream_Modules.h \
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   CosEvent/CEC_ProxyPushSupplier.h \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
-  CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -3089,7 +3089,7 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -3101,16 +3101,16 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
+  $(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/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 \
   CosEvent/event_export.h CosEvent/CEC_ProxyPushSupplier.i \
   CosEvent/CEC_Dispatching_Task.i
 
@@ -3118,7 +3118,7 @@ realclean: clean
   CosEvent/CEC_MT_Dispatching.h \
   $(ACE_ROOT)/ace/pre.h \
   CosEvent/CEC_Dispatching.h \
-  CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -3303,8 +3303,8 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  CosEvent/event_export.h \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   CosEvent/event_export.h CosEvent/CEC_Dispatching.i \
   CosEvent/CEC_Dispatching_Task.h \
   $(ACE_ROOT)/ace/Task.h \
@@ -3380,8 +3380,8 @@ realclean: clean
   $(ACE_ROOT)/ace/Stream_Modules.h \
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
   CosEvent/CEC_ProxyPushSupplier.h \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -3393,16 +3393,16 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
+  $(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/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 \
   CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_Dispatching_Task.i \
   CosEvent/CEC_MT_Dispatching.i
 
@@ -3411,7 +3411,7 @@ realclean: clean
   CosEvent/CEC_Reactive_ConsumerControl.h \
   $(ACE_ROOT)/ace/pre.h \
   CosEvent/CEC_ConsumerControl.h \
-  CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -3597,9 +3597,9 @@ realclean: clean
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   CosEvent/CEC_ConsumerControl.i \
-  ESF/ESF_Worker.h \
-  ESF/ESF_Worker.i \
-  ESF/ESF_Worker.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \
   CosEvent/CEC_Reactive_ConsumerControl.i CosEvent/CEC_EventChannel.h \
   CosEvent/CEC_Factory.h CosEvent/event_export.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -3607,10 +3607,10 @@ realclean: clean
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
   CosEvent/CEC_Factory.i \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
-  CosEventCommC.h \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -3622,27 +3622,27 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
+  $(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/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 \
   CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \
   CosEvent/CEC_ConsumerAdmin.h \
-  ESF/ESF_Proxy_Admin.h \
-  ESF/ESF_Proxy_Collection.h \
-  ESF/ESF_Proxy_Collection.i \
-  ESF/ESF_Proxy_Collection.cpp \
-  ESF/ESF_Proxy_Admin.i \
-  ESF/ESF_Proxy_Admin.cpp \
-  ESF/ESF_Shutdown_Proxy.h \
-  ESF/ESF_Shutdown_Proxy.i \
-  ESF/ESF_Shutdown_Proxy.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \
   CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \
   CosEvent/CEC_ProxyPullSupplier.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
@@ -3742,7 +3742,7 @@ realclean: clean
   CosEvent/CEC_Reactive_SupplierControl.h \
   $(ACE_ROOT)/ace/pre.h \
   CosEvent/CEC_SupplierControl.h \
-  CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -3928,9 +3928,9 @@ realclean: clean
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   CosEvent/CEC_SupplierControl.i \
-  ESF/ESF_Worker.h \
-  ESF/ESF_Worker.i \
-  ESF/ESF_Worker.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \
   CosEvent/CEC_Reactive_SupplierControl.i CosEvent/CEC_EventChannel.h \
   CosEvent/CEC_Factory.h CosEvent/event_export.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -3938,10 +3938,10 @@ realclean: clean
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
   CosEvent/CEC_Factory.i \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
-  CosEventCommC.h \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -3953,27 +3953,27 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
+  $(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/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 \
   CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \
   CosEvent/CEC_SupplierAdmin.h \
-  ESF/ESF_Proxy_Admin.h \
-  ESF/ESF_Proxy_Collection.h \
-  ESF/ESF_Proxy_Collection.i \
-  ESF/ESF_Proxy_Collection.cpp \
-  ESF/ESF_Proxy_Admin.i \
-  ESF/ESF_Proxy_Admin.cpp \
-  ESF/ESF_Shutdown_Proxy.h \
-  ESF/ESF_Shutdown_Proxy.i \
-  ESF/ESF_Shutdown_Proxy.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \
   CosEvent/CEC_ProxyPushConsumer.h CosEvent/CEC_ProxyPushConsumer.i \
   CosEvent/CEC_ProxyPullConsumer.h CosEvent/CEC_ProxyPullConsumer.i \
   CosEvent/CEC_SupplierAdmin.i \
@@ -4050,7 +4050,7 @@ realclean: clean
 .obj/CEC_Pulling_Strategy.o .obj/CEC_Pulling_Strategy.so .shobj/CEC_Pulling_Strategy.o .shobj/CEC_Pulling_Strategy.so: CosEvent/CEC_Pulling_Strategy.cpp \
   CosEvent/CEC_Pulling_Strategy.h \
   $(ACE_ROOT)/ace/pre.h \
-  CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -4066,7 +4066,7 @@ realclean: clean
   CosEvent/CEC_Reactive_Pulling_Strategy.h \
   $(ACE_ROOT)/ace/pre.h \
   CosEvent/CEC_Pulling_Strategy.h \
-  CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/svc_export.h \
@@ -4076,7 +4076,7 @@ realclean: clean
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   CosEvent/CEC_Pulling_Strategy.i \
-  ESF/ESF_Worker.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -4253,14 +4253,14 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  ESF/ESF_Worker.i \
-  ESF/ESF_Worker.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \
   CosEvent/CEC_Reactive_Pulling_Strategy.i \
   CosEvent/CEC_ProxyPullConsumer.h \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
-  CosEventCommC.h \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -4272,16 +4272,16 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
+  $(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/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 \
   CosEvent/event_export.h CosEvent/CEC_ProxyPullConsumer.i \
   CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -4290,15 +4290,15 @@ realclean: clean
   $(ACE_ROOT)/ace/Service_Object.i \
   CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
   CosEvent/CEC_EventChannel.i CosEvent/CEC_SupplierAdmin.h \
-  ESF/ESF_Proxy_Admin.h \
-  ESF/ESF_Proxy_Collection.h \
-  ESF/ESF_Proxy_Collection.i \
-  ESF/ESF_Proxy_Collection.cpp \
-  ESF/ESF_Proxy_Admin.i \
-  ESF/ESF_Proxy_Admin.cpp \
-  ESF/ESF_Shutdown_Proxy.h \
-  ESF/ESF_Shutdown_Proxy.i \
-  ESF/ESF_Shutdown_Proxy.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \
   CosEvent/CEC_ProxyPushConsumer.h CosEvent/CEC_ProxyPushConsumer.i \
   CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ConsumerAdmin.h \
   CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \
@@ -4605,9 +4605,9 @@ realclean: clean
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   CosEvent/CEC_Default_Factory.i CosEvent/CEC_MT_Dispatching.h \
   CosEvent/CEC_Dispatching.h \
-  CosEventCommC.h \
-  CosEvent/event_export.h \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
   CosEvent/CEC_Dispatching.i CosEvent/CEC_Dispatching_Task.h \
   $(ACE_ROOT)/ace/Task.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -4663,8 +4663,8 @@ realclean: clean
   $(ACE_ROOT)/ace/Stream_Modules.h \
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
   CosEvent/CEC_ProxyPushSupplier.h \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -4676,32 +4676,32 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
+  $(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/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 \
   CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_Dispatching_Task.i \
   CosEvent/CEC_MT_Dispatching.i CosEvent/CEC_Reactive_Pulling_Strategy.h \
   CosEvent/CEC_Pulling_Strategy.h CosEvent/CEC_Pulling_Strategy.i \
-  ESF/ESF_Worker.h \
-  ESF/ESF_Worker.i \
-  ESF/ESF_Worker.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \
   CosEvent/CEC_Reactive_Pulling_Strategy.i CosEvent/CEC_ConsumerAdmin.h \
-  ESF/ESF_Proxy_Admin.h \
-  ESF/ESF_Proxy_Collection.h \
-  ESF/ESF_Proxy_Collection.i \
-  ESF/ESF_Proxy_Collection.cpp \
-  ESF/ESF_Proxy_Admin.i \
-  ESF/ESF_Proxy_Admin.cpp \
-  ESF/ESF_Shutdown_Proxy.h \
-  ESF/ESF_Shutdown_Proxy.i \
-  ESF/ESF_Shutdown_Proxy.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \
   CosEvent/CEC_ProxyPullSupplier.h CosEvent/CEC_ProxyPullSupplier.i \
   CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_SupplierAdmin.h \
   CosEvent/CEC_ProxyPushConsumer.h CosEvent/CEC_ProxyPushConsumer.i \
@@ -4712,34 +4712,34 @@ realclean: clean
   CosEvent/CEC_Reactive_ConsumerControl.i \
   CosEvent/CEC_Reactive_SupplierControl.h CosEvent/CEC_SupplierControl.h \
   CosEvent/CEC_SupplierControl.i CosEvent/CEC_Reactive_SupplierControl.i \
-  ESF/ESF_Immediate_Changes.h \
-  ESF/ESF_Immediate_Changes.i \
-  ESF/ESF_Immediate_Changes.cpp \
-  ESF/ESF_Delayed_Changes.h \
-  ESF/ESF_Busy_Lock.h \
-  ESF/ESF_Busy_Lock.i \
-  ESF/ESF_Busy_Lock.cpp \
-  ESF/ESF_Delayed_Changes.i \
-  ESF/ESF_Delayed_Changes.cpp \
-  ESF/ESF_Defaults.h \
-  ESF/ESF_Delayed_Command.h \
-  ESF/ESF_Delayed_Command.i \
-  ESF/ESF_Delayed_Command.cpp \
-  ESF/ESF_Copy_On_Write.h \
-  ESF/ESF_Copy_On_Write.i \
-  ESF/ESF_Copy_On_Write.cpp \
-  ESF/ESF_Copy_On_Read.h \
-  ESF/ESF_Copy_On_Read.i \
-  ESF/ESF_Copy_On_Read.cpp \
-  ESF/ESF_Proxy_List.h \
-  ESF/ESF_Proxy_List.i \
-  ESF/ESF_Proxy_List.cpp \
-  ESF/ESF_Proxy_RB_Tree.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Defaults.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.h \
   $(ACE_ROOT)/ace/RB_Tree.i \
   $(ACE_ROOT)/ace/RB_Tree.cpp \
-  ESF/ESF_Proxy_RB_Tree.i \
-  ESF/ESF_Proxy_RB_Tree.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp \
   $(ACE_ROOT)/ace/Arg_Shifter.h \
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i
@@ -4940,11 +4940,11 @@ realclean: clean
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   CosEvent/CEC_Factory.i \
-  CosEventChannelAdminS.h \
-  CosEventCommS.h \
-  CosEventCommC.h \
-  CosEvent/event_export.h \
-  CosEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.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)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -4956,20 +4956,20 @@ realclean: clean
   $(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 \
-  CosEventCommS_T.h \
-  CosEventCommS_T.i \
-  CosEventCommS_T.cpp \
-  CosEventCommS.i \
-  CosEventChannelAdminC.h \
-  CosEventChannelAdminC.i \
-  CosEventChannelAdminS_T.h \
-  CosEventChannelAdminS_T.i \
-  CosEventChannelAdminS_T.cpp \
-  CosEventChannelAdminS.i \
+  $(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/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 \
   CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \
-  CosNamingC.h \
-  Naming/naming_export.h \
-  CosNamingC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -4989,11 +4989,11 @@ realclean: clean
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp \
-  CosEvent/CEC_EventChannel.h \
-  CosEvent/CEC_Default_Factory.h \
-  CosEvent/CEC_Factory.h \
-  CosEvent/CEC_Defaults.h \
-  CosEvent/CEC_Default_Factory.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i \
   $(ACE_ROOT)/ace/Get_Opt.h \
   $(ACE_ROOT)/ace/Get_Opt.i