diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2000-09-20 18:20:49 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2000-09-20 18:20:49 +0000 |
commit | 90f519fdf2dfad8d7ac1da9551b56474a68344a4 (patch) | |
tree | 2156c9fe87727c41a653a9820e74d8b69d1beaad | |
parent | d29ee8daaff3a9a56084bda263f212f54982e526 (diff) | |
download | ATCD-90f519fdf2dfad8d7ac1da9551b56474a68344a4.tar.gz |
Regenerated broken dependencies.
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosConcurrency | 72 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosEvent | 1446 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosLifeCycle | 12 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosNaming | 169 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosNotification | 2384 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosProperty | 27 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosTime | 225 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosTrading | 696 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin | 354 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing | 120 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.RTEvent | 2680 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.RTOLDEvent | 1047 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.RTSched | 483 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.RTSchedEvent | 476 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.SSLIOP | 114 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.Security | 6 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.Svc_Utils | 30 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.av | 923 |
18 files changed, 6046 insertions, 5218 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosConcurrency b/TAO/orbsvcs/orbsvcs/Makefile.CosConcurrency index adf8a74adac..b7b6fbd2762 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosConcurrency +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosConcurrency @@ -118,7 +118,7 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \ + CosConcurrencyControlC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -192,6 +192,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -346,8 +349,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/concurrency_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \ + Concurrency/concurrency_export.h \ + CosConcurrencyControlC.i \ Concurrency/concurrency_export.h .obj/CC_LockSet.o .obj/CC_LockSet.so .shobj/CC_LockSet.o .shobj/CC_LockSet.so: Concurrency/CC_LockSet.cpp Concurrency/CC_LockSet.h \ @@ -398,8 +401,8 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Token.h \ $(ACE_ROOT)/ace/Token.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \ + CosConcurrencyControlS.h \ + CosConcurrencyControlC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -473,6 +476,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -627,8 +633,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/concurrency_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \ + Concurrency/concurrency_export.h \ + CosConcurrencyControlC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -637,17 +643,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i \ + CosConcurrencyControlS_T.h \ + CosConcurrencyControlS_T.i \ + CosConcurrencyControlS_T.cpp \ + CosConcurrencyControlS.i \ Concurrency/concurrency_export.h .obj/CC_LockSetFactory.o .obj/CC_LockSetFactory.so .shobj/CC_LockSetFactory.o .shobj/CC_LockSetFactory.so: Concurrency/CC_LockSetFactory.cpp \ Concurrency/CC_LockSetFactory.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \ + CosConcurrencyControlS.h \ + CosConcurrencyControlC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -765,6 +771,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -919,8 +928,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/concurrency_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \ + Concurrency/concurrency_export.h \ + CosConcurrencyControlC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -929,10 +938,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i \ + CosConcurrencyControlS_T.h \ + CosConcurrencyControlS_T.i \ + CosConcurrencyControlS_T.cpp \ + CosConcurrencyControlS.i \ Concurrency/concurrency_export.h Concurrency/CC_LockSet.h \ $(ACE_ROOT)/ace/Token.h \ $(ACE_ROOT)/ace/Token.i @@ -944,7 +953,7 @@ realclean: clean $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \ + CosConcurrencyControlC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1057,6 +1066,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1211,10 +1223,10 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/concurrency_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \ + Concurrency/concurrency_export.h \ + CosConcurrencyControlC.i \ Concurrency/Concurrency_Utils.h Concurrency/CC_LockSetFactory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \ + CosConcurrencyControlS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1223,10 +1235,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i \ + CosConcurrencyControlS_T.h \ + CosConcurrencyControlS_T.i \ + CosConcurrencyControlS_T.cpp \ + CosConcurrencyControlS.i \ Concurrency/concurrency_export.h .obj/CosConcurrencyControlS.o .obj/CosConcurrencyControlS.so .shobj/CosConcurrencyControlS.o .shobj/CosConcurrencyControlS.so: CosConcurrencyControlS.cpp \ @@ -1350,6 +1362,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1660,6 +1675,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent index ad6aebc65ae..99512ced814 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent @@ -101,9 +101,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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -221,6 +221,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -375,8 +378,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -385,28 +388,28 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ - $(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 \ + 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 \ CosEvent/CEC_ProxyPushSupplier.h CosEvent/event_export.h \ CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_ProxyPullSupplier.h \ CosEvent/CEC_ProxyPullSupplier.i CosEvent/CEC_ConsumerAdmin.i \ @@ -418,7 +421,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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ + CosEvent/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -536,6 +539,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -695,7 +701,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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -813,6 +819,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -967,12 +976,12 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventCommC.i \ CosEvent/event_export.h CosEvent/CEC_Dispatching.i \ CosEvent/CEC_ProxyPushSupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -981,16 +990,16 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/CEC_ProxyPushSupplier.i .obj/CEC_EventChannel.o .obj/CEC_EventChannel.so .shobj/CEC_EventChannel.o .shobj/CEC_EventChannel.so: CosEvent/CEC_EventChannel.cpp \ @@ -1113,6 +1122,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1268,11 +1280,11 @@ realclean: clean $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ CosEvent/CEC_Factory.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 \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1281,32 +1293,32 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \ CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \ CosEvent/CEC_Pulling_Strategy.h CosEvent/CEC_Pulling_Strategy.i \ CosEvent/CEC_ConsumerAdmin.h \ - $(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 \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \ CosEvent/CEC_ProxyPullSupplier.h CosEvent/CEC_ProxyPullSupplier.i \ CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_SupplierAdmin.h \ @@ -1437,6 +1449,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1598,9 +1613,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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1718,6 +1733,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1872,8 +1890,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1882,32 +1900,32 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_EventChannel.h \ CosEvent/CEC_Factory.h CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerAdmin.h \ - $(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 \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \ CosEvent/CEC_ProxyPullSupplier.h CosEvent/CEC_ProxyPullSupplier.i \ CosEvent/CEC_ConsumerAdmin.i @@ -1915,9 +1933,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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -2035,6 +2053,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2189,8 +2210,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2199,32 +2220,32 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + 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 \ CosEvent/event_export.h CosEvent/CEC_ProxyPullConsumer.i \ CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \ CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerAdmin.h \ - $(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 \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \ CosEvent/CEC_ProxyPullSupplier.h CosEvent/CEC_ProxyPullSupplier.i \ CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_SupplierControl.h \ @@ -2233,9 +2254,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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -2353,6 +2374,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2507,8 +2531,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2517,35 +2541,35 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/event_export.h CosEvent/CEC_ProxyPushSupplier.i \ CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \ CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \ CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerControl.h \ CosEvent/CEC_ConsumerControl.i \ - $(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 + 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 .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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -2663,6 +2687,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2817,8 +2844,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2827,16 +2854,16 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/event_export.h CosEvent/CEC_ProxyPullSupplier.i \ CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \ CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \ @@ -2846,9 +2873,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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -2966,6 +2993,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3120,8 +3150,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3130,28 +3160,28 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ - $(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 \ + 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 \ CosEvent/CEC_ProxyPushConsumer.h CosEvent/event_export.h \ CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_ProxyPullConsumer.h \ CosEvent/CEC_ProxyPullConsumer.i CosEvent/CEC_SupplierAdmin.i \ @@ -3162,7 +3192,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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ + CosEvent/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -3280,6 +3310,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3578,11 +3611,11 @@ realclean: clean $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ + CosEvent/event_export.h \ CosEvent/CEC_ProxyPushSupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -3619,6 +3652,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3725,7 +3761,7 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3734,16 +3770,16 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/event_export.h CosEvent/CEC_ProxyPushSupplier.i \ CosEvent/CEC_Dispatching_Task.i @@ -3751,7 +3787,7 @@ realclean: clean CosEvent/CEC_MT_Dispatching.h \ $(ACE_ROOT)/ace/pre.h \ CosEvent/CEC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -3869,6 +3905,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4023,8 +4062,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventCommC.i \ CosEvent/event_export.h CosEvent/CEC_Dispatching.i \ CosEvent/CEC_Dispatching_Task.h \ $(ACE_ROOT)/ace/Task.h \ @@ -4038,8 +4077,8 @@ realclean: clean $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ CosEvent/CEC_ProxyPushSupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -4048,16 +4087,16 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_Dispatching_Task.i \ CosEvent/CEC_MT_Dispatching.i @@ -4066,7 +4105,7 @@ realclean: clean CosEvent/CEC_Reactive_ConsumerControl.h \ $(ACE_ROOT)/ace/pre.h \ CosEvent/CEC_ConsumerControl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ + CosEvent/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -4184,6 +4223,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4339,15 +4381,15 @@ realclean: clean $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ CosEvent/CEC_ConsumerControl.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 \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ CosEvent/CEC_Reactive_ConsumerControl.i CosEvent/CEC_EventChannel.h \ CosEvent/CEC_Factory.h CosEvent/event_export.h CosEvent/CEC_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -4356,27 +4398,27 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \ CosEvent/CEC_ConsumerAdmin.h \ - $(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 \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \ CosEvent/CEC_ProxyPullSupplier.h CosEvent/CEC_ProxyPullSupplier.i \ CosEvent/CEC_ConsumerAdmin.i @@ -4386,7 +4428,7 @@ realclean: clean CosEvent/CEC_Reactive_SupplierControl.h \ $(ACE_ROOT)/ace/pre.h \ CosEvent/CEC_SupplierControl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ + CosEvent/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -4504,6 +4546,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4659,15 +4704,15 @@ realclean: clean $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ CosEvent/CEC_SupplierControl.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 \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ CosEvent/CEC_Reactive_SupplierControl.i CosEvent/CEC_EventChannel.h \ CosEvent/CEC_Factory.h CosEvent/event_export.h CosEvent/CEC_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -4676,27 +4721,27 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \ CosEvent/CEC_SupplierAdmin.h \ - $(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 \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPushConsumer.h CosEvent/CEC_ProxyPushConsumer.i \ CosEvent/CEC_ProxyPullConsumer.h CosEvent/CEC_ProxyPullConsumer.i \ CosEvent/CEC_SupplierAdmin.i @@ -4704,7 +4749,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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ + CosEvent/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -4732,7 +4777,7 @@ realclean: clean CosEvent/CEC_Reactive_Pulling_Strategy.h \ $(ACE_ROOT)/ace/pre.h \ CosEvent/CEC_Pulling_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ + CosEvent/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -4754,7 +4799,7 @@ realclean: clean $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ CosEvent/CEC_Pulling_Strategy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + ESF/ESF_Worker.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -4852,6 +4897,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5006,14 +5054,14 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ CosEvent/CEC_Reactive_Pulling_Strategy.i \ CosEvent/CEC_ProxyPullConsumer.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -5022,29 +5070,29 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/event_export.h CosEvent/CEC_ProxyPullConsumer.i \ CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \ CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ CosEvent/CEC_EventChannel.i CosEvent/CEC_SupplierAdmin.h \ - $(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 \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPushConsumer.h CosEvent/CEC_ProxyPushConsumer.i \ CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ConsumerAdmin.h \ CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \ @@ -5171,6 +5219,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5328,9 +5379,9 @@ realclean: clean CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ CosEvent/CEC_Default_Factory.i CosEvent/CEC_MT_Dispatching.h \ CosEvent/CEC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ CosEvent/CEC_Dispatching.i CosEvent/CEC_Dispatching_Task.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ @@ -5343,8 +5394,8 @@ realclean: clean $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ CosEvent/CEC_ProxyPushSupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -5353,33 +5404,33 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/CEC_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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ CosEvent/CEC_Reactive_Pulling_Strategy.i CosEvent/CEC_ConsumerAdmin.h \ - $(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 \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPullSupplier.h CosEvent/CEC_ProxyPullSupplier.i \ CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_SupplierAdmin.h \ CosEvent/CEC_ProxyPushConsumer.h CosEvent/CEC_ProxyPushConsumer.i \ @@ -5391,34 +5442,34 @@ realclean: clean CosEvent/CEC_Reactive_SupplierControl.h \ CosEvent/CEC_SupplierControl.h CosEvent/CEC_SupplierControl.i \ CosEvent/CEC_Reactive_SupplierControl.i \ - $(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 \ + ESF/ESF_Immediate_Changes.h \ + ESF/ESF_Immediate_Changes.i \ + ESF/ESF_Immediate_Changes.cpp \ + ESF/ESF_Delayed_Changes.h \ + ESF/ESF_Busy_Lock.h \ + ESF/ESF_Busy_Lock.i \ + ESF/ESF_Busy_Lock.cpp \ + ESF/ESF_Delayed_Changes.i \ + ESF/ESF_Delayed_Changes.cpp \ + ESF/ESF_Defaults.h \ + ESF/ESF_Delayed_Command.h \ + ESF/ESF_Delayed_Command.i \ + ESF/ESF_Delayed_Command.cpp \ + ESF/ESF_Copy_On_Write.h \ + ESF/ESF_Copy_On_Write.i \ + ESF/ESF_Copy_On_Write.cpp \ + ESF/ESF_Copy_On_Read.h \ + ESF/ESF_Copy_On_Read.i \ + ESF/ESF_Copy_On_Read.cpp \ + ESF/ESF_Proxy_List.h \ + ESF/ESF_Proxy_List.i \ + ESF/ESF_Proxy_List.cpp \ + ESF/ESF_Proxy_RB_Tree.h \ $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/RB_Tree.i \ $(ACE_ROOT)/ace/RB_Tree.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp \ + ESF/ESF_Proxy_RB_Tree.i \ + ESF/ESF_Proxy_RB_Tree.cpp \ $(ACE_ROOT)/ace/Arg_Shifter.h \ $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/Sched_Params.i @@ -5551,6 +5602,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5702,11 +5756,11 @@ realclean: clean $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ CosEvent/CEC_Factory.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 \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -5715,34 +5769,34 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(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 \ + CosEvent/CEC_EventChannel.h \ + CosEvent/CEC_Default_Factory.h \ + CosEvent/CEC_Factory.h \ + CosEvent/CEC_Defaults.h \ + CosEvent/CEC_Default_Factory.i \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i .obj/ConsumerAdmin_i.o .obj/ConsumerAdmin_i.so .shobj/ConsumerAdmin_i.o .shobj/ConsumerAdmin_i.so: CosEvent/ConsumerAdmin_i.cpp \ CosEvent/ConsumerAdmin_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -5860,6 +5914,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6014,22 +6071,22 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.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 \ + Event/event_export.h \ + RtecEventCommC.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -6038,17 +6095,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosEvent/ProxyPushSupplier_i.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp @@ -6056,7 +6113,7 @@ realclean: clean .obj/SupplierAdmin_i.o .obj/SupplierAdmin_i.so .shobj/SupplierAdmin_i.o .shobj/SupplierAdmin_i.so: CosEvent/SupplierAdmin_i.cpp \ CosEvent/SupplierAdmin_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -6174,6 +6231,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6328,26 +6388,26 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Event/event_export.h \ + RtecEventCommC.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ + CosEventChannelAdminC.h \ + CosEvent/event_export.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventChannelAdminC.i \ + CosEvent/ProxyPushConsumer_i.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -6361,38 +6421,38 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.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/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp @@ -6400,7 +6460,7 @@ realclean: clean .obj/EventChannel_i.o .obj/EventChannel_i.so .shobj/EventChannel_i.o .shobj/EventChannel_i.so: CosEvent/EventChannel_i.cpp \ CosEvent/EventChannel_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -6518,6 +6578,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6672,25 +6735,25 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + Event/event_export.h \ + RtecEventCommC.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ + CosEventChannelAdminC.h \ + CosEvent/event_export.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventChannelAdminC.i \ + CosEvent/ConsumerAdmin_i.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -6699,55 +6762,55 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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/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/CosEvent/ProxyPushSupplier_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosEvent/ProxyPushSupplier_i.h \ + CosEvent/SupplierAdmin_i.h \ + CosEvent/ProxyPushConsumer_i.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp .obj/ProxyPushConsumer_i.o .obj/ProxyPushConsumer_i.so .shobj/ProxyPushConsumer_i.o .shobj/ProxyPushConsumer_i.so: CosEvent/ProxyPushConsumer_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ + Event_Utilities.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -6865,6 +6928,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -7019,28 +7085,28 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + Event/event_export.h \ + RtecEventCommC.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ + Event_Utilities.i \ + CosEventChannelAdminC.h \ + CosEvent/event_export.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -7049,52 +7115,52 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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/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/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ CosEvent/ProxyPushConsumer_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + RtecEventChannelAdminS.h \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ CosEvent/event_export.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp .obj/ProxyPushSupplier_i.o .obj/ProxyPushSupplier_i.so .shobj/ProxyPushSupplier_i.o .shobj/ProxyPushSupplier_i.so: CosEvent/ProxyPushSupplier_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ @@ -7213,6 +7279,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -7367,24 +7436,24 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + Event/event_export.h \ + RtecEventCommC.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ + CosEventChannelAdminC.h \ + CosEvent/event_export.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -7393,34 +7462,34 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.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/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/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ CosEvent/ProxyPushSupplier_i.h CosEvent/event_export.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ @@ -7428,7 +7497,7 @@ realclean: clean .obj/CosEvent_Utilities.o .obj/CosEvent_Utilities.so .shobj/CosEvent_Utilities.o .shobj/CosEvent_Utilities.so: CosEvent_Utilities.cpp CosEvent_Utilities.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + RtecSchedulerC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -7546,6 +7615,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -7700,16 +7772,16 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -7723,66 +7795,66 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.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)/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/Event_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + Event_Utilities.h \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ + Event_Utilities.i \ CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h \ + Event/EC_Event_Channel.h \ + Event/EC_Factory.h \ + Event/EC_Factory.i \ + Event/EC_Defaults.h \ + Event/EC_Event_Channel.i \ + CosEvent/EventChannel_i.h \ + CosEvent/ConsumerAdmin_i.h \ + CosEvent/ProxyPushSupplier_i.h \ + CosEvent/SupplierAdmin_i.h \ + CosEvent/ProxyPushConsumer_i.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp @@ -7906,6 +7978,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -8216,6 +8291,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -8527,6 +8605,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -8803,6 +8884,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosLifeCycle b/TAO/orbsvcs/orbsvcs/Makefile.CosLifeCycle index 3ff4a27bd30..585c7c55dc7 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosLifeCycle +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosLifeCycle @@ -187,6 +187,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -499,6 +502,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -812,6 +818,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1088,6 +1097,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosNaming b/TAO/orbsvcs/orbsvcs/Makefile.CosNaming index a7775e155cd..f7bd2b5b1ba 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosNaming +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosNaming @@ -85,8 +85,8 @@ realclean: clean .obj/Naming_Context_Interface.o .obj/Naming_Context_Interface.so .shobj/Naming_Context_Interface.o .shobj/Naming_Context_Interface.so: Naming/Naming_Context_Interface.cpp \ Naming/Naming_Context_Interface.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosNamingS.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -204,6 +204,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -358,8 +361,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -368,10 +371,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ Naming/naming_export.h .obj/Hash_Naming_Context.o .obj/Hash_Naming_Context.so .shobj/Hash_Naming_Context.o .shobj/Hash_Naming_Context.so: Naming/Hash_Naming_Context.cpp \ @@ -400,8 +403,8 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ Naming/Hash_Naming_Context.h Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosNamingS.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -499,6 +502,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -653,8 +659,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -663,10 +669,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ Naming/naming_export.h .obj/Persistent_Naming_Context.o .obj/Persistent_Naming_Context.so .shobj/Persistent_Naming_Context.o .shobj/Persistent_Naming_Context.so: Naming/Persistent_Naming_Context.cpp \ @@ -696,8 +702,8 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.cpp \ Naming/Persistent_Naming_Context.h Naming/Hash_Naming_Context.h \ Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosNamingS.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -795,6 +801,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -949,8 +958,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -959,10 +968,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ Naming/naming_export.h Naming/Persistent_Entries.h \ $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.h \ $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.i \ @@ -997,8 +1006,8 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.cpp \ Naming/Transient_Naming_Context.h Naming/Hash_Naming_Context.h \ Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosNamingS.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1096,6 +1105,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1250,8 +1262,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1260,10 +1272,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ Naming/naming_export.h Naming/Entries.h Naming/Bindings_Iterator_T.h \ Naming/Bindings_Iterator_T.cpp @@ -1417,6 +1429,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1544,9 +1559,9 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ Naming/naming_export.h .obj/Entries.o .obj/Entries.so .shobj/Entries.o .shobj/Entries.so: Naming/Entries.cpp Naming/Entries.h \ @@ -1695,6 +1710,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1822,9 +1840,9 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ Naming/naming_export.h .obj/Persistent_Context_Index.o .obj/Persistent_Context_Index.so .shobj/Persistent_Context_Index.o .shobj/Persistent_Context_Index.so: Naming/Persistent_Context_Index.cpp \ @@ -1978,6 +1996,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2105,9 +2126,9 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ Naming/naming_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ @@ -2115,15 +2136,15 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ Naming/Persistent_Naming_Context.h Naming/Hash_Naming_Context.h \ Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + CosNamingS.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp @@ -2247,6 +2268,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2401,11 +2425,11 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + IOR_Multicast.h \ + svc_utils_export.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ @@ -2420,7 +2444,7 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_Dgram.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + CosNamingS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2429,10 +2453,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ Naming/naming_export.h Naming/Transient_Naming_Context.h \ Naming/Hash_Naming_Context.h Naming/Entries.h \ Naming/Persistent_Context_Index.h Naming/Persistent_Entries.h \ @@ -2548,7 +2572,7 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/Object_Loader.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + Naming/Naming_Utils.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -2576,6 +2600,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2726,11 +2753,11 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + IOR_Multicast.h \ + svc_utils_export.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ @@ -2744,8 +2771,8 @@ realclean: clean $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + Naming/Naming_Context_Interface.h \ + CosNamingS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2754,10 +2781,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp @@ -2880,6 +2907,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3188,6 +3218,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosNotification b/TAO/orbsvcs/orbsvcs/Makefile.CosNotification index 91a33a514cb..d735fbd1592 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosNotification +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosNotification @@ -217,9 +217,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -261,6 +261,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -415,8 +418,8 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -425,61 +428,61 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ Notify/notify_export.h Notify/Notify_EventChannel_i.h \ Notify/Notify_QoSAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/Notify_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event.h Notify/Notify_Event.i \ Notify/Notify_Channel_Objects_Factory.h Notify/Notify_POA_Factory.h \ Notify/Notify_Factory.h Notify/Notify_FilterFactory_i.h .obj/Notify_EventChannel_i.o .obj/Notify_EventChannel_i.so .shobj/Notify_EventChannel_i.o .shobj/Notify_EventChannel_i.so: Notify/Notify_EventChannel_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ @@ -598,6 +601,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -752,17 +758,17 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(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 \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_EventChannel_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -771,50 +777,50 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ Notify/Notify_ID_Pool_T.cpp Notify/Notify_QoSAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/notify_export.h Notify/Notify_Collection.h \ Notify/Notify_Event.h Notify/Notify_Event.i \ Notify/Notify_EventChannelFactory_i.h Notify/Notify_SupplierAdmin_i.h \ @@ -842,7 +848,7 @@ endif # ACE_HAS_GNUG_PRE_2_8 Notify/Notify_Collection_Factory.h .obj/Notify_ConsumerAdmin_i.o .obj/Notify_ConsumerAdmin_i.so .shobj/Notify_ConsumerAdmin_i.o .shobj/Notify_ConsumerAdmin_i.so: Notify/Notify_ConsumerAdmin_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ @@ -961,6 +967,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1115,17 +1124,17 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(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 \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_ConsumerAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1134,50 +1143,50 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ Notify/Notify_ID_Pool_T.cpp Notify/Notify_QoSAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/notify_export.h Notify/Notify_FilterAdmin_i.h \ Notify/Notify_Event.h Notify/Notify_Event.i Notify/Notify_Listeners.h \ Notify/Notify_Collection.h Notify/Notify_ProxyPushSupplier_i.h \ @@ -1237,9 +1246,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ Notify/Notify_SupplierAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1337,6 +1346,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1491,8 +1503,8 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1501,64 +1513,64 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ Notify/Notify_ID_Pool_T.cpp Notify/Notify_QoSAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/notify_export.h Notify/Notify_FilterAdmin_i.h \ Notify/Notify_Event.h Notify/Notify_Event.i \ Notify/Notify_ProxyPushConsumer_i.h Notify/Notify_ProxyConsumer_T.h \ Notify/Notify_Proxy_T.h Notify/Notify_Listeners.h \ Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ Notify/Notify_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event_Manager.i Notify/Notify_Event_Map.h \ Notify/Notify_Event_Map.i \ - $(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 \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Notify_Event_Processor.h \ $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1663,9 +1675,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1707,6 +1719,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1861,8 +1876,8 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1871,63 +1886,63 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_QoSAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/notify_export.h Notify/Notify_FilterAdmin_i.h \ Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ Notify/Notify_ID_Pool_T.cpp Notify/Notify_Event.h \ Notify/Notify_Event.i Notify/Notify_Listeners.h \ Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ Notify/Notify_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event_Manager.i Notify/Notify_Event_Map.h \ Notify/Notify_Event_Map.i \ - $(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 \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Notify_Event_Processor.h \ $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1954,9 +1969,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 Notify/Notify_StructuredProxyPushSupplier_i.cpp \ Notify/Notify_StructuredProxyPushSupplier_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -2074,6 +2089,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2228,8 +2246,8 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2238,64 +2256,64 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_ProxySupplier_T.h Notify/Notify_Proxy_T.h \ Notify/Notify_QoSAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/notify_export.h Notify/Notify_FilterAdmin_i.h \ Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ Notify/Notify_ID_Pool_T.cpp Notify/Notify_Event.h \ Notify/Notify_Event.i Notify/Notify_Listeners.h \ Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ Notify/Notify_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event_Manager.i Notify/Notify_Event_Map.h \ Notify/Notify_Event_Map.i \ - $(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 \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Notify_Event_Processor.h \ $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/Task_T.h \ @@ -2399,9 +2417,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2443,6 +2461,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2597,8 +2618,8 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2607,63 +2628,63 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_QoSAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/notify_export.h Notify/Notify_FilterAdmin_i.h \ Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ Notify/Notify_ID_Pool_T.cpp Notify/Notify_Event.h \ Notify/Notify_Event.i Notify/Notify_Listeners.h \ Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ Notify/Notify_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event_Manager.i Notify/Notify_Event_Map.h \ Notify/Notify_Event_Map.i \ - $(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 \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Notify_Event_Processor.h \ $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/Task_T.h \ @@ -2766,9 +2787,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2810,6 +2831,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2964,8 +2988,8 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2974,63 +2998,63 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_QoSAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/notify_export.h Notify/Notify_FilterAdmin_i.h \ Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ Notify/Notify_ID_Pool_T.cpp Notify/Notify_Event.h \ Notify/Notify_Event.i Notify/Notify_Listeners.h \ Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ Notify/Notify_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event_Manager.i Notify/Notify_Event_Map.h \ Notify/Notify_Event_Map.i \ - $(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 \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Notify_Event_Processor.h \ $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/Task_T.h \ @@ -3057,9 +3081,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 Notify/Notify_StructuredProxyPushConsumer_i.cpp \ Notify/Notify_StructuredProxyPushConsumer_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -3177,6 +3201,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3331,8 +3358,8 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3341,64 +3368,64 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_ProxyConsumer_T.h Notify/Notify_Proxy_T.h \ Notify/Notify_QoSAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/notify_export.h Notify/Notify_FilterAdmin_i.h \ Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ Notify/Notify_ID_Pool_T.cpp Notify/Notify_Event.h \ Notify/Notify_Event.i Notify/Notify_Listeners.h \ Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ Notify/Notify_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event_Manager.i Notify/Notify_Event_Map.h \ Notify/Notify_Event_Map.i \ - $(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 \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Notify_Event_Processor.h \ $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/Task_T.h \ @@ -3502,9 +3529,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -3546,6 +3573,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3700,8 +3730,8 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3710,63 +3740,63 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_QoSAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/notify_export.h Notify/Notify_FilterAdmin_i.h \ Notify/Notify_ID_Pool_T.h Notify/Notify_ID_Pool_T.i \ Notify/Notify_ID_Pool_T.cpp Notify/Notify_Event.h \ Notify/Notify_Event.i Notify/Notify_Listeners.h \ Notify/Notify_Proxy_T.cpp Notify/Notify_Event_Manager.h \ Notify/Notify_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event_Manager.i Notify/Notify_Event_Map.h \ Notify/Notify_Event_Map.i \ - $(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 \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Notify_Event_Processor.h \ $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/Task_T.h \ @@ -3869,9 +3899,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -3913,6 +3943,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4067,8 +4100,8 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -4077,50 +4110,50 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/notify_export.h Notify/Notify_Event.i .obj/Notify_Filter_i.o .obj/Notify_Filter_i.so .shobj/Notify_Filter_i.o .shobj/Notify_Filter_i.so: Notify/Notify_Filter_i.cpp \ @@ -4149,8 +4182,8 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ Notify/Notify_Filter_i.h Notify/Notify_Constraint_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -4248,6 +4281,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4402,16 +4438,16 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Trader/trading_export.h \ + Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils.h \ + Trader/Interpreter.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -4420,55 +4456,55 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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/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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/notify_export.h Notify/Notify_ID_Pool_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(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 \ + CosNotifyChannelAdminS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ Notify/Notify_Constraint_Visitors.h .obj/Notify_FilterFactory_i.o .obj/Notify_FilterFactory_i.so .shobj/Notify_FilterFactory_i.o .shobj/Notify_FilterFactory_i.so: Notify/Notify_FilterFactory_i.cpp \ Notify/Notify_FilterFactory_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -4586,6 +4622,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4740,8 +4779,8 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -4750,59 +4789,59 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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/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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/notify_export.h Notify/Notify_Filter_i.h \ Notify/Notify_Constraint_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ + Trader/trading_export.h \ + Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils.h \ + Trader/Interpreter.h \ Notify/Notify_ID_Pool_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(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 \ + CosNotifyChannelAdminS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp .obj/Notify_QoSAdmin_i.o .obj/Notify_QoSAdmin_i.so .shobj/Notify_QoSAdmin_i.o .shobj/Notify_QoSAdmin_i.so: Notify/Notify_QoSAdmin_i.cpp \ Notify/Notify_QoSAdmin_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -4920,6 +4959,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5074,19 +5116,19 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/notify_export.h .obj/Notify_Constraint_Interpreter.o .obj/Notify_Constraint_Interpreter.so .shobj/Notify_Constraint_Interpreter.o .shobj/Notify_Constraint_Interpreter.so: \ Notify/Notify_Constraint_Interpreter.cpp \ Notify/Notify_Constraint_Interpreter.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ $(ACE_ROOT)/ace/post.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -5204,6 +5246,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5358,16 +5403,16 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Trader/trading_export.h \ + Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils.h \ + Trader/Interpreter.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -5376,30 +5421,30 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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/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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/notify_export.h Notify/Notify_Constraint_Visitors.h .obj/Notify_Constraint_Visitors.o .obj/Notify_Constraint_Visitors.so .shobj/Notify_Constraint_Visitors.o .shobj/Notify_Constraint_Visitors.so: Notify/Notify_Constraint_Visitors.cpp \ @@ -5508,8 +5553,8 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -5551,6 +5596,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5678,17 +5726,17 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Trader/trading_export.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ Notify/notify_export.h .obj/Notify_Event.o .obj/Notify_Event.so .shobj/Notify_Event.o .shobj/Notify_Event.so: Notify/Notify_Event.cpp Notify/Notify_Event.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -5806,6 +5854,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5960,25 +6011,25 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ Notify/notify_export.h \ - $(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 \ + CosNotificationC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + Notify/notify_export.h \ + CosNotifyFilterC.h \ + CosNotifyCommC.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + CosNotifyFilterC.i \ Notify/Notify_Event.i .obj/Notify_Collection.o .obj/Notify_Collection.so .shobj/Notify_Collection.o .shobj/Notify_Collection.so: Notify/Notify_Collection.cpp \ Notify/Notify_Collection.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + CosNotifyCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -6096,6 +6147,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6250,26 +6304,26 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.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/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/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/notify_export.h \ + CosNotificationC.h \ + CosNotificationC.i \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/notify_export.h Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ Notify/Notify_Event.i Notify/Notify_Listeners.h .obj/Notify_Event_Map.o .obj/Notify_Event_Map.so .shobj/Notify_Event_Map.o .shobj/Notify_Event_Map.so: Notify/Notify_Event_Map.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ @@ -6388,6 +6442,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6542,33 +6599,33 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(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 \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + CosNotificationC.h \ Notify/notify_export.h \ - $(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 \ + CosNotificationC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + Notify/notify_export.h \ + CosNotifyFilterC.h \ + CosNotifyCommC.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + CosNotifyFilterC.i \ Notify/Notify_Event.i Notify/Notify_Event_Map.h \ Notify/Notify_Collection.h Notify/Notify_Event_Map.i \ Notify/Notify_Factory.h Notify/Notify_Event_Manager_Objects_Factory.h \ Notify/Notify_Collection_Factory.h .obj/Notify_Event_Manager.o .obj/Notify_Event_Manager.so .shobj/Notify_Event_Manager.o .shobj/Notify_Event_Manager.so: Notify/Notify_Event_Manager.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ @@ -6687,6 +6744,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6841,28 +6901,28 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(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 \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ Notify/notify_export.h Notify/Notify_Listeners.h \ Notify/Notify_Collection.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 \ + CosNotifyCommC.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ Notify/Notify_Event.i Notify/Notify_Event_Manager.i \ Notify/Notify_Event_Map.h Notify/Notify_Event_Map.i \ Notify/Notify_Event_Processor.h \ @@ -7068,6 +7128,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -7176,33 +7239,33 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/BoundsC.i \ Notify/notify_export.h Notify/Notify_Worker_Task.h \ Notify/Notify_Command.h Notify/Notify_Command.i Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.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 \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + CosNotifyFilterC.h \ + CosNotifyCommC.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + CosNotifyFilterC.i \ Notify/Notify_Event.i Notify/Notify_Source_Filter_Eval_Command.h \ Notify/Notify_Listener_Filter_Eval_Command.h \ Notify/Notify_Event_Manager_Objects_Factory.h \ Notify/Notify_Lookup_Command.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event_Dispatch_Command.h Notify/Notify_Factory.h \ Notify/Notify_Listeners.h Notify/Notify_Event_Manager.h \ Notify/Notify_Collection.h Notify/Notify_Event_Manager.i \ Notify/Notify_Event_Map.h Notify/Notify_Event_Map.i \ - $(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 \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Notify_AdminProperties.h Notify/Notify_AdminProperties.i .obj/Notify_Worker_Task.o .obj/Notify_Worker_Task.so .shobj/Notify_Worker_Task.o .shobj/Notify_Worker_Task.so: Notify/Notify_Worker_Task.cpp \ @@ -7383,6 +7446,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -7491,19 +7557,19 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/BoundsC.i \ Notify/Notify_Command.h Notify/notify_export.h \ Notify/Notify_Command.i Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.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 \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + CosNotifyFilterC.h \ + CosNotifyCommC.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + CosNotifyFilterC.i \ Notify/Notify_Event.i .obj/Notify_Source_Filter_Eval_Command.o .obj/Notify_Source_Filter_Eval_Command.so .shobj/Notify_Source_Filter_Eval_Command.o .shobj/Notify_Source_Filter_Eval_Command.so: \ @@ -7628,6 +7694,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -7783,24 +7852,24 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ Notify/notify_export.h Notify/Notify_Command.i Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.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 \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + CosNotifyFilterC.h \ + CosNotifyCommC.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + CosNotifyFilterC.i \ Notify/Notify_Event.i Notify/Notify_Listeners.h \ Notify/Notify_Lookup_Command.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Worker_Task.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ @@ -7819,7 +7888,7 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/Stream.cpp .obj/Notify_Lookup_Command.o .obj/Notify_Lookup_Command.so .shobj/Notify_Lookup_Command.o .shobj/Notify_Lookup_Command.so: Notify/Notify_Lookup_Command.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ @@ -7938,6 +8007,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -8092,26 +8164,26 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(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 \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Lookup_Command.h Notify/Notify_Command.h \ Notify/notify_export.h Notify/Notify_Command.i Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.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 \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + CosNotifyFilterC.h \ + CosNotifyCommC.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + CosNotifyFilterC.i \ Notify/Notify_Event.i Notify/Notify_Event_Manager.h \ Notify/Notify_Listeners.h Notify/Notify_Collection.h \ Notify/Notify_Event_Manager.i Notify/Notify_Event_Map.h \ @@ -8135,7 +8207,7 @@ endif # ACE_HAS_GNUG_PRE_2_8 .obj/Notify_Listener_Filter_Eval_Command.o .obj/Notify_Listener_Filter_Eval_Command.so .shobj/Notify_Listener_Filter_Eval_Command.o .shobj/Notify_Listener_Filter_Eval_Command.so: \ Notify/Notify_Listener_Filter_Eval_Command.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ @@ -8254,6 +8326,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -8408,26 +8483,26 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(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 \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Listener_Filter_Eval_Command.h Notify/Notify_Command.h \ Notify/notify_export.h Notify/Notify_Command.i Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.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 \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + CosNotifyFilterC.h \ + CosNotifyCommC.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + CosNotifyFilterC.i \ Notify/Notify_Event.i Notify/Notify_Event_Dispatch_Command.h \ Notify/Notify_Worker_Task.h \ $(ACE_ROOT)/ace/Task.h \ @@ -8568,6 +8643,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -8723,19 +8801,19 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ Notify/notify_export.h Notify/Notify_Command.i Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.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 \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + CosNotifyFilterC.h \ + CosNotifyCommC.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + CosNotifyFilterC.i \ Notify/Notify_Event.i Notify/Notify_Listeners.h \ Notify/Notify_Event_Processor.h \ $(ACE_ROOT)/ace/Module.h \ @@ -8875,6 +8953,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -9030,23 +9111,23 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ Notify/notify_export.h Notify/Notify_Command.i Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.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 \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + CosNotifyFilterC.h \ + CosNotifyCommC.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + CosNotifyFilterC.i \ Notify/Notify_Event.i Notify/Notify_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Listeners.h .obj/Notify_Factory.o .obj/Notify_Factory.so .shobj/Notify_Factory.o .shobj/Notify_Factory.so: Notify/Notify_Factory.cpp \ @@ -9193,6 +9274,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -9334,23 +9418,23 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ Notify/Notify_Default_Collection_Factory.h \ Notify/Notify_Collection_Factory.h Notify/Notify_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.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/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/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + CosNotifyCommC.h \ + Notify/notify_export.h \ + CosNotificationC.h \ + CosNotificationC.i \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ Notify/Notify_Event.i Notify/Notify_Listeners.h \ Notify/Notify_Default_EMO_Factory.h \ Notify/Notify_Event_Manager_Objects_Factory.h @@ -9480,6 +9564,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -9632,11 +9719,11 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/BoundsC.i \ Notify/notify_export.h Notify/Notify_Factory.h \ Notify/Notify_EventChannelFactory_i.h Notify/Notify_ID_Pool_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -9645,61 +9732,61 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(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 \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_ID_Pool_T.i Notify/Notify_ID_Pool_T.cpp \ Notify/Notify_EventChannel_i.h Notify/Notify_QoSAdmin_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/Notify_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event.h Notify/Notify_Event.i \ Notify/Notify_Event_Manager.h Notify/Notify_Listeners.h \ Notify/Notify_Event_Manager.i Notify/Notify_Event_Map.h \ Notify/Notify_Event_Map.i \ - $(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 \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Notify_Event_Processor.h \ $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/Task_T.h \ @@ -9855,6 +9942,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -10045,7 +10135,7 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Service_Object.i \ Notify/Notify_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + CosNotifyCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -10139,6 +10229,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -10289,35 +10382,35 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.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/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/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/notify_export.h \ + CosNotificationC.h \ + CosNotificationC.i \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ Notify/Notify_Event.i Notify/Notify_Listeners.h \ - $(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_Immediate_Changes.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_Immediate_Changes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.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 \ + ESF/ESF_Proxy_List.h \ + ESF/ESF_Proxy_List.i \ + ESF/ESF_Proxy_List.cpp \ + ESF/ESF_Immediate_Changes.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Immediate_Changes.i \ + ESF/ESF_Immediate_Changes.cpp \ + ESF/ESF_Copy_On_Write.h \ + ESF/ESF_Copy_On_Write.i \ + ESF/ESF_Copy_On_Write.cpp \ Notify/Notify_Factory.h .obj/Notify_Default_EMO_Factory.o .obj/Notify_Default_EMO_Factory.so .shobj/Notify_Default_EMO_Factory.o .shobj/Notify_Default_EMO_Factory.so: Notify/Notify_Default_EMO_Factory.cpp \ @@ -10448,6 +10541,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -10599,29 +10695,29 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ Notify/notify_export.h Notify/Notify_Event_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ Notify/Notify_Listeners.h Notify/Notify_Collection.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/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + CosNotifyCommC.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ Notify/Notify_Event.i Notify/Notify_Event_Manager.i \ Notify/Notify_Event_Map.h Notify/Notify_Event_Map.i \ - $(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 \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Notify_Event_Processor.h \ $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/Task_T.h \ @@ -10645,7 +10741,7 @@ endif # ACE_HAS_GNUG_PRE_2_8 .obj/Notify_AdminProperties.o .obj/Notify_AdminProperties.so .shobj/Notify_AdminProperties.o .shobj/Notify_AdminProperties.so: Notify/Notify_AdminProperties.cpp \ Notify/Notify_AdminProperties.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -10763,6 +10859,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -10917,8 +11016,8 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ Notify/Notify_Listeners.h Notify/notify_export.h \ Notify/Notify_AdminProperties.i @@ -11042,6 +11141,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -11197,22 +11299,22 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ Notify/Notify_AdminProperties.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ Notify/Notify_Listeners.h Notify/notify_export.h \ Notify/Notify_AdminProperties.i Notify/Notify_Command.h \ Notify/Notify_Command.i Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.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 \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + CosNotifyFilterC.h \ + CosNotifyCommC.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + CosNotifyFilterC.i \ Notify/Notify_Event.i .obj/Notify_MT_Worker_Task.o .obj/Notify_MT_Worker_Task.so .shobj/Notify_MT_Worker_Task.o .shobj/Notify_MT_Worker_Task.so: Notify/Notify_MT_Worker_Task.cpp \ @@ -11394,6 +11496,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -11502,19 +11607,19 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/BoundsC.i \ Notify/Notify_Command.h Notify/notify_export.h \ Notify/Notify_Command.i Notify/Notify_Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.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 \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + CosNotifyFilterC.h \ + CosNotifyCommC.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + CosNotifyFilterC.i \ Notify/Notify_Event.i Notify/Notify_AdminProperties.h \ Notify/Notify_Listeners.h Notify/Notify_AdminProperties.i \ Notify/Notify_Buffering_Strategy.h @@ -11639,6 +11744,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -11793,15 +11901,15 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h .obj/Constraint_Visitors.o .obj/Constraint_Visitors.so .shobj/Constraint_Visitors.o .shobj/Constraint_Visitors.so: Trader/Constraint_Visitors.cpp \ Trader/Constraint_Visitors.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + Trader/Interpreter_Utils.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ @@ -11946,6 +12054,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -12073,13 +12184,13 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + Trader/trading_export.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ Trader/Constraint_Nodes.h Trader/Interpreter_Utils_T.h \ Trader/Interpreter_Utils_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils_T.h \ + Trader/Constraint_Visitors.h \ $(TAO_ROOT)/tao/DynamicAny/DynSequence_i.h \ $(TAO_ROOT)/tao/DynamicAny/DynamicAny.h \ $(TAO_ROOT)/tao/DynamicAny/dynamicany_export.h \ @@ -12209,6 +12320,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -12363,10 +12477,10 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h .obj/Constraint_l.o .obj/Constraint_l.so .shobj/Constraint_l.o .shobj/Constraint_l.so: Trader/Constraint_l.cpp \ $(ACE_ROOT)/ace/OS.h \ @@ -12489,6 +12603,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -12643,14 +12760,14 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h \ Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -12659,17 +12776,17 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i .obj/Constraint_y.o .obj/Constraint_y.so .shobj/Constraint_y.o .shobj/Constraint_y.so: Trader/Constraint_y.cpp \ $(ACE_ROOT)/ace/OS.h \ @@ -12792,6 +12909,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -12946,14 +13066,14 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h \ Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -12962,20 +13082,20 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i .obj/Interpreter_Utils_T.o .obj/Interpreter_Utils_T.so .shobj/Interpreter_Utils_T.o .shobj/Interpreter_Utils_T.so: Trader/Interpreter_Utils_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h \ + Trader/Interpreter_Utils_T.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ @@ -13094,6 +13214,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -13248,12 +13371,12 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + Trader/Interpreter_Utils_T.cpp \ + Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils.h \ + Trader/trading_export.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ $(TAO_ROOT)/tao/DynamicAny/DynSequence_i.h \ $(TAO_ROOT)/tao/DynamicAny/DynamicAny.h \ $(TAO_ROOT)/tao/DynamicAny/dynamicany_export.h \ @@ -13409,6 +13532,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -13536,7 +13662,7 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h + Trader/trading_export.h .obj/CosNotificationS.o .obj/CosNotificationS.so .shobj/CosNotificationS.o .shobj/CosNotificationS.so: CosNotificationS.cpp CosNotificationS.h \ $(ACE_ROOT)/ace/pre.h CosNotificationC.h \ @@ -13657,6 +13783,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -13968,6 +14097,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -14291,6 +14423,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -14605,6 +14740,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -14920,6 +15058,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -15230,6 +15371,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -15541,6 +15685,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -15849,6 +15996,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -16159,6 +16309,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -16435,6 +16588,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -16714,6 +16870,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -16991,6 +17150,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -17268,6 +17430,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -17544,6 +17709,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -17820,6 +17988,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -18095,6 +18266,9 @@ endif # ACE_HAS_GNUG_PRE_2_8 $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosProperty b/TAO/orbsvcs/orbsvcs/Makefile.CosProperty index 9d5fbdfb07f..14a5e51757e 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosProperty +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosProperty @@ -70,7 +70,7 @@ realclean: clean .obj/CosPropertyService_i.o .obj/CosPropertyService_i.so .shobj/CosPropertyService_i.o .shobj/CosPropertyService_i.so: Property/CosPropertyService_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + Property/CosPropertyService_i.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ @@ -92,9 +92,9 @@ realclean: clean $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -192,6 +192,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -346,7 +349,7 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -355,10 +358,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i .obj/CosPropertyServiceS.o .obj/CosPropertyServiceS.so .shobj/CosPropertyServiceS.o .shobj/CosPropertyServiceS.so: CosPropertyServiceS.cpp CosPropertyServiceS.h \ $(ACE_ROOT)/ace/pre.h CosPropertyServiceC.h \ @@ -479,6 +482,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -788,6 +794,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosTime b/TAO/orbsvcs/orbsvcs/Makefile.CosTime index 8e60e966aa2..e66219e0c51 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosTime +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosTime @@ -75,8 +75,8 @@ realclean: clean .obj/TAO_Time_Service_Server.o .obj/TAO_Time_Service_Server.so .shobj/TAO_Time_Service_Server.o .shobj/TAO_Time_Service_Server.so: Time/TAO_Time_Service_Server.cpp \ Time/TAO_UTO.h $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeServiceS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -177,6 +177,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -188,7 +191,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -354,8 +357,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -364,17 +367,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time/time_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + TimeServiceC.h \ + Time/time_export.h \ + TimeServiceC.i \ + TimeServiceS_T.h \ + TimeServiceS_T.i \ + TimeServiceS_T.cpp \ + TimeServiceS.i \ Time/time_export.h Time/TAO_TIO.h \ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ Time/TAO_Time_Service_Server.h @@ -467,7 +470,7 @@ realclean: clean $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + Naming/Naming_Utils.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -509,6 +512,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -654,11 +660,11 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + IOR_Multicast.h \ + svc_utils_export.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ @@ -672,8 +678,8 @@ realclean: clean $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + Naming/Naming_Context_Interface.h \ + CosNamingS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -682,38 +688,38 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ + TimeServiceS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time/time_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \ + TimeBaseC.h \ + TimeBaseC.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + TimeServiceC.h \ + Time/time_export.h \ + TimeServiceC.i \ + TimeServiceS_T.h \ + TimeServiceS_T.i \ + TimeServiceS_T.cpp \ + TimeServiceS.i \ Time/Timer_Helper.h Time/time_export.h Time/TAO_TIO.h \ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ Time/TAO_UTO.h .obj/TAO_UTO.o .obj/TAO_UTO.so .shobj/TAO_UTO.o .shobj/TAO_UTO.so: Time/TAO_UTO.cpp Time/TAO_UTO.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeServiceS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -814,6 +820,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -825,7 +834,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -991,8 +1000,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1001,17 +1010,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time/time_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + TimeServiceC.h \ + Time/time_export.h \ + TimeServiceC.i \ + TimeServiceS_T.h \ + TimeServiceS_T.i \ + TimeServiceS_T.cpp \ + TimeServiceS.i \ Time/time_export.h Time/TAO_TIO.h \ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h @@ -1113,6 +1122,9 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -1163,14 +1175,14 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeServiceS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -1301,23 +1313,23 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time/time_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + TimeServiceC.h \ + Time/time_export.h \ + TimeServiceC.i \ + TimeServiceS_T.h \ + TimeServiceS_T.i \ + TimeServiceS_T.cpp \ + TimeServiceS.i \ Time/TAO_UTO.h Time/time_export.h .obj/Timer_Helper.o .obj/Timer_Helper.so .shobj/Timer_Helper.o .shobj/Timer_Helper.so: Time/Timer_Helper.cpp Time/Timer_Helper.h \ @@ -1399,8 +1411,8 @@ realclean: clean $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ Time/time_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeServiceS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -1425,6 +1437,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -1436,7 +1451,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -1602,8 +1617,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1612,23 +1627,23 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time/time_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + TimeServiceC.h \ + Time/time_export.h \ + TimeServiceC.i \ + TimeServiceS_T.h \ + TimeServiceS_T.i \ + TimeServiceS_T.cpp \ + TimeServiceS.i \ Time/TAO_Time_Service_Clerk.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + Naming/Naming_Utils.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + IOR_Multicast.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ @@ -1642,12 +1657,12 @@ realclean: clean $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i + Naming/Naming_Context_Interface.h \ + CosNamingS.h \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i .obj/TimeServiceS.o .obj/TimeServiceS.so .shobj/TimeServiceS.o .shobj/TimeServiceS.so: TimeServiceS.cpp TimeServiceS.h \ $(ACE_ROOT)/ace/pre.h TimeBaseS.h \ @@ -1751,6 +1766,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -2083,6 +2101,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosTrading b/TAO/orbsvcs/orbsvcs/Makefile.CosTrading index eff31413ed2..d83b0810300 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosTrading +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosTrading @@ -208,6 +208,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -362,14 +365,14 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h \ Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -378,26 +381,26 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ Trader/Trader_Constraint_Visitors.h Trader/Trader.h \ Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ Trader/Trader_Utils.h .obj/Constraint_Nodes.o .obj/Constraint_Nodes.so .shobj/Constraint_Nodes.o .shobj/Constraint_Nodes.so: Trader/Constraint_Nodes.cpp \ @@ -521,6 +524,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -675,15 +681,15 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h .obj/Constraint_Visitors.o .obj/Constraint_Visitors.so .shobj/Constraint_Visitors.o .shobj/Constraint_Visitors.so: Trader/Constraint_Visitors.cpp \ Trader/Constraint_Visitors.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + Trader/Interpreter_Utils.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ @@ -828,6 +834,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -955,13 +964,13 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + Trader/trading_export.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ Trader/Constraint_Nodes.h Trader/Interpreter_Utils_T.h \ Trader/Interpreter_Utils_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils_T.h \ + Trader/Constraint_Visitors.h \ $(TAO_ROOT)/tao/DynamicAny/DynSequence_i.h \ $(TAO_ROOT)/tao/DynamicAny/DynamicAny.h \ $(TAO_ROOT)/tao/DynamicAny/dynamicany_export.h \ @@ -1091,6 +1100,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1245,14 +1257,14 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h \ Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1261,17 +1273,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i .obj/Constraint_y.o .obj/Constraint_y.so .shobj/Constraint_y.o .shobj/Constraint_y.so: Trader/Constraint_y.cpp \ $(ACE_ROOT)/ace/OS.h \ @@ -1394,6 +1406,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1548,14 +1563,14 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h \ Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1564,17 +1579,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i .obj/Offer_Database.o .obj/Offer_Database.so .shobj/Offer_Database.o .shobj/Offer_Database.so: Trader/Offer_Database.cpp Trader/Offer_Database.h \ $(ACE_ROOT)/ace/pre.h Trader/Trader.h \ @@ -1723,6 +1738,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1850,10 +1868,10 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + Trader/trading_export.h \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1862,24 +1880,24 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ Trader/Offer_Iterators.h Trader/Trader_Utils.h \ Trader/Offer_Database.cpp @@ -2030,6 +2048,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2157,10 +2178,10 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + Trader/trading_export.h \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2169,24 +2190,24 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i .obj/Offer_Iterators_T.o .obj/Offer_Iterators_T.so .shobj/Offer_Iterators_T.o .shobj/Offer_Iterators_T.so: Trader/Offer_Iterators_T.cpp \ Trader/Offer_Iterators_T.h \ @@ -2337,6 +2358,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2464,10 +2488,10 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + Trader/trading_export.h \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2476,24 +2500,24 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ Trader/Offer_Database.h Trader/Offer_Database.cpp \ Trader/Offer_Iterators_T.cpp @@ -2645,6 +2669,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2772,10 +2799,10 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + Trader/trading_export.h \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2784,24 +2811,24 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i .obj/Trader.o .obj/Trader.so .shobj/Trader.o .shobj/Trader.so: Trader/Trader.cpp Trader/Trader.h \ $(ACE_ROOT)/ace/pre.h \ @@ -2950,6 +2977,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3077,10 +3107,10 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + Trader/trading_export.h \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3089,32 +3119,32 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ Trader/Offer_Iterators_T.h Trader/Offer_Iterators.h \ Trader/Trader_Utils.h Trader/Offer_Database.h \ Trader/Offer_Database.cpp Trader/Offer_Iterators_T.cpp \ Trader/Trader_Interfaces.h Trader/Constraint_Interpreter.h \ Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h \ Trader/Interpreter.h Trader/Trader_T.h Trader/Trader_T.cpp \ Trader/Trader_Interfaces.cpp \ $(ACE_ROOT)/ace/INET_Addr.h \ @@ -3272,6 +3302,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3399,10 +3432,10 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + Trader/trading_export.h \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3411,28 +3444,28 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \ Trader/Constraint_Tokens.h Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h \ Trader/Interpreter.h Trader/Offer_Iterators_T.h \ Trader/Offer_Iterators.h Trader/Offer_Database.h \ Trader/Offer_Database.cpp Trader/Offer_Iterators_T.cpp \ @@ -3447,7 +3480,7 @@ realclean: clean Trader/Trader_Constraint_Visitors.h \ $(ACE_ROOT)/ace/pre.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + Trader/Interpreter_Utils.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ @@ -3592,6 +3625,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3719,13 +3755,13 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + Trader/trading_export.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ Trader/Trader.h Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3734,24 +3770,24 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ Trader/Trader_Utils.h .obj/Trader_T.o .obj/Trader_T.so .shobj/Trader_T.o .shobj/Trader_T.so: Trader/Trader_T.cpp Trader/Trader_T.h \ @@ -3901,6 +3937,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4028,10 +4067,10 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + Trader/trading_export.h \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -4040,31 +4079,31 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ Trader/Offer_Database.h Trader/Offer_Iterators.h \ Trader/Trader_Utils.h Trader/Offer_Database.cpp Trader/Trader_T.cpp \ Trader/Trader_Interfaces.h Trader/Constraint_Interpreter.h \ Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h \ Trader/Interpreter.h Trader/Offer_Iterators_T.h \ Trader/Offer_Iterators_T.cpp Trader/Trader_Interfaces.cpp \ $(ACE_ROOT)/ace/INET_Addr.h \ @@ -4220,6 +4259,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4347,10 +4389,10 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + Trader/trading_export.h \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -4359,24 +4401,24 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i .obj/Interpreter.o .obj/Interpreter.so .shobj/Interpreter.o .shobj/Interpreter.so: Trader/Interpreter.cpp Trader/Interpreter.h \ $(ACE_ROOT)/ace/pre.h \ @@ -4498,6 +4540,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4652,13 +4697,13 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h .obj/Interpreter_Utils_T.o .obj/Interpreter_Utils_T.so .shobj/Interpreter_Utils_T.o .shobj/Interpreter_Utils_T.so: Trader/Interpreter_Utils_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h \ + Trader/Interpreter_Utils_T.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ @@ -4777,6 +4822,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4931,12 +4979,12 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + Trader/Interpreter_Utils_T.cpp \ + Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils.h \ + Trader/trading_export.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ $(TAO_ROOT)/tao/DynamicAny/DynSequence_i.h \ $(TAO_ROOT)/tao/DynamicAny/DynamicAny.h \ $(TAO_ROOT)/tao/DynamicAny/dynamicany_export.h \ @@ -5092,6 +5140,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5219,7 +5270,7 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h + Trader/trading_export.h .obj/Trading_Loader.o .obj/Trading_Loader.so .shobj/Trading_Loader.o .shobj/Trading_Loader.so: Trader/Trading_Loader.cpp Trader/Trading_Loader.h \ $(TAO_ROOT)/tao/Object_Loader.h \ @@ -5325,6 +5376,9 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -5378,8 +5432,8 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + IOR_Multicast.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -5519,35 +5573,35 @@ realclean: clean $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + Trader/Trader.h \ + Trader/Interpreter_Utils.h \ + Trader/trading_export.h \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ + Trader/Service_Type_Repository.h \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(ACE_ROOT)/ace/Arg_Shifter.h @@ -5671,6 +5725,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5979,6 +6036,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6289,6 +6349,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6599,6 +6662,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6874,6 +6940,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -7150,6 +7219,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin b/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin index cd18e85f0fb..75eb25b3e74 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin +++ b/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin @@ -77,9 +77,9 @@ realclean: clean .obj/LogRecordStore.o .obj/LogRecordStore.so .shobj/LogRecordStore.o .shobj/LogRecordStore.so: Log/LogRecordStore.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + Time_Utilities.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -197,6 +197,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -351,12 +354,12 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + svc_utils_export.h \ + TimeBaseC.i \ + Time_Utilities.i \ + Log/LogRecordStore.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -370,31 +373,31 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + Log/Log_Constraint_Interpreter.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ + Trader/trading_export.h \ + Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils.h \ + Trader/Interpreter.h \ + Log/Log_Constraint_Visitors.h .obj/BasicLogFactory_i.o .obj/BasicLogFactory_i.so .shobj/BasicLogFactory_i.o .shobj/BasicLogFactory_i.so: Log/BasicLogFactory_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h \ + Log/BasicLogFactory_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -495,6 +498,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -506,7 +512,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -672,8 +678,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -682,29 +688,29 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogMgr_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/BasicLog_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + Log/LogMgr_i.h \ + Log/BasicLog_i.h \ + Log/Log_i.h \ + Log/LogRecordStore.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp .obj/Iterator_i.o .obj/Iterator_i.so .shobj/Iterator_i.o .shobj/Iterator_i.so: Log/Iterator_i.cpp Log/Iterator_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -805,6 +811,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -816,7 +825,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -982,8 +991,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -992,32 +1001,32 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + Log/LogRecordStore.h \ + Log/Log_Constraint_Interpreter.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ + Trader/trading_export.h \ + Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils.h \ + Trader/Interpreter.h \ + Log/Log_Constraint_Visitors.h .obj/BasicLog_i.o .obj/BasicLog_i.so .shobj/BasicLog_i.o .shobj/BasicLog_i.so: Log/BasicLog_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/BasicLog_i.h \ + Log/BasicLog_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -1118,6 +1127,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -1129,7 +1141,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -1295,8 +1307,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1305,27 +1317,27 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogMgr_i.h + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + Log/Log_i.h \ + Log/LogRecordStore.h \ + Log/LogMgr_i.h .obj/Log_i.o .obj/Log_i.so .shobj/Log_i.o .shobj/Log_i.so: Log/Log_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \ + Log/Log_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Log/LogRecordStore.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -1426,6 +1438,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -1437,7 +1452,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -1603,8 +1618,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1613,31 +1628,31 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Iterator_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + Log/Iterator_i.h \ + Log/Log_Constraint_Interpreter.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ + Trader/trading_export.h \ + Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils.h \ + Trader/Interpreter.h \ + Log/Log_Constraint_Visitors.h .obj/LogMgr_i.o .obj/LogMgr_i.so .shobj/LogMgr_i.o .shobj/LogMgr_i.so: Log/LogMgr_i.cpp Log/LogMgr_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -1738,6 +1753,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -1749,7 +1767,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -1915,8 +1933,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1925,27 +1943,27 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/BasicLog_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + Log/BasicLog_i.h \ + Log/Log_i.h \ + Log/LogRecordStore.h \ Log/log_export.h .obj/Log_Constraint_Visitors.o .obj/Log_Constraint_Visitors.so .shobj/Log_Constraint_Visitors.o .shobj/Log_Constraint_Visitors.so: Log/Log_Constraint_Visitors.cpp \ Log/Log_Constraint_Visitors.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ @@ -2090,6 +2108,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2217,22 +2238,22 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ + Trader/trading_export.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ + DsLogAdminC.h \ + Log/log_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + DsLogAdminC.i \ Log/log_export.h .obj/Log_Constraint_Interpreter.o .obj/Log_Constraint_Interpreter.so .shobj/Log_Constraint_Interpreter.o .shobj/Log_Constraint_Interpreter.so: Log/Log_Constraint_Interpreter.cpp \ Log/Log_Constraint_Interpreter.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ $(ACE_ROOT)/ace/post.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -2350,6 +2371,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2504,16 +2528,16 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ + Trader/trading_export.h \ + Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils.h \ + Trader/Interpreter.h \ + DsLogAdminC.h \ + Log/log_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + DsLogAdminC.i \ Log/log_export.h Log/Log_Constraint_Visitors.h .obj/DsLogAdminS.o .obj/DsLogAdminS.so .shobj/DsLogAdminS.o .shobj/DsLogAdminS.so: DsLogAdminS.cpp DsLogAdminS.h \ @@ -2618,6 +2642,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -2950,6 +2977,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing b/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing index cca9a955c67..17613ec6946 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing +++ b/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing @@ -82,8 +82,8 @@ realclean: clean .obj/LoadBalancer_i.o .obj/LoadBalancer_i.so .shobj/LoadBalancer_i.o .shobj/LoadBalancer_i.so: LoadBalancing/LoadBalancer_i.cpp \ LoadBalancing/LoadBalancer_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.h \ + LoadBalancingS.h \ + LoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -201,6 +201,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -355,8 +358,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.i \ + LoadBalancing/LoadBalancing_export.h \ + LoadBalancingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -365,10 +368,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.i \ + LoadBalancingS_T.h \ + LoadBalancingS_T.i \ + LoadBalancingS_T.cpp \ + LoadBalancingS.i \ LoadBalancing/ReplicaProxy.h LoadBalancing/LoadBalancing_export.h \ LoadBalancing/ReplicaProxy.i LoadBalancing/ReplicaLocator.h \ LoadBalancing/LoadBalancing_Strategy.h LoadBalancing/LoadBalancer_i.i @@ -376,8 +379,8 @@ realclean: clean .obj/LoadBalancing_Strategy.o .obj/LoadBalancing_Strategy.so .shobj/LoadBalancing_Strategy.o .shobj/LoadBalancing_Strategy.so: LoadBalancing/LoadBalancing_Strategy.cpp \ LoadBalancing/LoadBalancing_Strategy.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.h \ + LoadBalancingS.h \ + LoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -495,6 +498,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -649,8 +655,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.i \ + LoadBalancing/LoadBalancing_export.h \ + LoadBalancingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -659,18 +665,18 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.i \ + LoadBalancingS_T.h \ + LoadBalancingS_T.i \ + LoadBalancingS_T.cpp \ + LoadBalancingS.i \ LoadBalancing/LoadBalancing_export.h \ LoadBalancing/LoadBalancing_Strategy.i .obj/ReplicaLocator.o .obj/ReplicaLocator.so .shobj/ReplicaLocator.o .shobj/ReplicaLocator.so: LoadBalancing/ReplicaLocator.cpp \ LoadBalancing/ReplicaLocator.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.h \ + LoadBalancingS.h \ + LoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -788,6 +794,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -942,8 +951,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.i \ + LoadBalancing/LoadBalancing_export.h \ + LoadBalancingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -952,10 +961,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.i \ + LoadBalancingS_T.h \ + LoadBalancingS_T.i \ + LoadBalancingS_T.cpp \ + LoadBalancingS.i \ LoadBalancing/LoadBalancing_export.h LoadBalancing/LoadBalancer_i.h \ LoadBalancing/ReplicaProxy.h LoadBalancing/ReplicaProxy.i \ LoadBalancing/LoadBalancing_Strategy.h LoadBalancing/LoadBalancer_i.i @@ -1007,8 +1016,8 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.h \ + LoadBalancingS.h \ + LoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1082,6 +1091,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1236,8 +1248,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.i \ + LoadBalancing/LoadBalancing_export.h \ + LoadBalancingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1246,10 +1258,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.i \ + LoadBalancingS_T.h \ + LoadBalancingS_T.i \ + LoadBalancingS_T.cpp \ + LoadBalancingS.i \ LoadBalancing/LoadBalancing_export.h LoadBalancing/ReplicaProxy.i \ LoadBalancing/LoadBalancer_i.h LoadBalancing/ReplicaLocator.h \ LoadBalancing/LoadBalancing_Strategy.h LoadBalancing/LoadBalancer_i.i @@ -1258,8 +1270,8 @@ realclean: clean LoadBalancing/Round_Robin_Strategy.h \ $(ACE_ROOT)/ace/pre.h \ LoadBalancing/LoadBalancing_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.h \ + LoadBalancingS.h \ + LoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1377,6 +1389,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1531,8 +1546,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.i \ + LoadBalancing/LoadBalancing_export.h \ + LoadBalancingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1541,10 +1556,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.i \ + LoadBalancingS_T.h \ + LoadBalancingS_T.i \ + LoadBalancingS_T.cpp \ + LoadBalancingS.i \ LoadBalancing/LoadBalancing_export.h LoadBalancing/ReplicaProxy.h \ LoadBalancing/ReplicaProxy.i @@ -1552,8 +1567,8 @@ realclean: clean LoadBalancing/Minimum_Dispersion.h \ $(ACE_ROOT)/ace/pre.h \ LoadBalancing/LoadBalancing_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.h \ + LoadBalancingS.h \ + LoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1671,6 +1686,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1825,8 +1843,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.i \ + LoadBalancing/LoadBalancing_export.h \ + LoadBalancingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1835,10 +1853,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.i \ + LoadBalancingS_T.h \ + LoadBalancingS_T.i \ + LoadBalancingS_T.cpp \ + LoadBalancingS.i \ LoadBalancing/LoadBalancing_export.h LoadBalancing/ReplicaProxy.h \ LoadBalancing/ReplicaProxy.i @@ -1961,6 +1979,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2270,6 +2291,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTEvent b/TAO/orbsvcs/orbsvcs/Makefile.RTEvent index a0239c297ba..9fa05f3e73f 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.RTEvent +++ b/TAO/orbsvcs/orbsvcs/Makefile.RTEvent @@ -136,7 +136,7 @@ realclean: clean .obj/EC_Event_Channel.o .obj/EC_Event_Channel.so .shobj/EC_Event_Channel.o .shobj/EC_Event_Channel.so: Event/EC_Event_Channel.cpp \ Event/EC_Event_Channel.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -254,6 +254,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -409,17 +412,17 @@ realclean: clean $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ Event/EC_Factory.i Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -428,61 +431,61 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i Event/EC_Default_Factory.h \ Event/EC_Default_Factory.i Event/EC_Dispatching.h \ Event/event_export.h Event/EC_Dispatching.i Event/EC_ConsumerAdmin.h \ Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \ Event/EC_SupplierAdmin.i Event/EC_Timeout_Generator.h \ @@ -505,9 +508,9 @@ realclean: clean Event/EC_ConsumerAdmin.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -608,6 +611,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -619,7 +625,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -785,8 +791,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -795,58 +801,58 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/event_export.h Event/EC_ConsumerAdmin.i \ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \ Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \ @@ -856,9 +862,9 @@ realclean: clean Event/EC_SupplierAdmin.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_ProxyConsumer.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -959,6 +965,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -970,7 +979,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -1136,8 +1145,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1146,58 +1155,58 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxyConsumer.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/event_export.h Event/EC_SupplierAdmin.i \ Event/EC_ProxySupplier.h Event/EC_ProxySupplier.i \ Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \ @@ -1206,9 +1215,9 @@ realclean: clean .obj/EC_ProxyConsumer.o .obj/EC_ProxyConsumer.so .shobj/EC_ProxyConsumer.o .shobj/EC_ProxyConsumer.so: Event/EC_ProxyConsumer.cpp \ Event/EC_ProxyConsumer.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -1309,6 +1318,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -1320,7 +1332,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -1486,8 +1498,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1496,54 +1508,54 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxyConsumer.i Event/EC_Event_Channel.h Event/EC_Factory.h \ Event/EC_Factory.i Event/EC_Defaults.h Event/EC_Event_Channel.i \ Event/EC_Supplier_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/event_export.h Event/EC_Supplier_Filter.i \ Event/EC_Supplier_Filter_Builder.h Event/EC_Supplier_Filter_Builder.i .obj/EC_ProxySupplier.o .obj/EC_ProxySupplier.so .shobj/EC_ProxySupplier.o .shobj/EC_ProxySupplier.so: Event/EC_ProxySupplier.cpp \ Event/EC_ProxySupplier.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -1644,6 +1656,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -1655,7 +1670,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -1821,8 +1836,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1831,39 +1846,39 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i Event/EC_Dispatching.h Event/event_export.h \ Event/EC_Dispatching.i Event/EC_Filter_Builder.h \ Event/EC_Filter_Builder.i Event/EC_QOS_Info.h Event/EC_QOS_Info.i \ @@ -1871,17 +1886,17 @@ realclean: clean Event/EC_Defaults.h Event/EC_Event_Channel.i \ Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \ Event/EC_ConsumerControl.h Event/EC_ConsumerControl.i \ - $(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 + 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 .obj/EC_Supplier_Filter.o .obj/EC_Supplier_Filter.so .shobj/EC_Supplier_Filter.o .shobj/EC_Supplier_Filter.so: Event/EC_Supplier_Filter.cpp \ Event/EC_Supplier_Filter.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1999,6 +2014,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2153,21 +2171,21 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.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 \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/event_export.h Event/EC_Supplier_Filter.i \ Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -2181,40 +2199,40 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i Event/EC_QOS_Info.h Event/EC_QOS_Info.i .obj/EC_Supplier_Filter_Builder.o .obj/EC_Supplier_Filter_Builder.so .shobj/EC_Supplier_Filter_Builder.o .shobj/EC_Supplier_Filter_Builder.so: Event/EC_Supplier_Filter_Builder.cpp \ Event/EC_Supplier_Filter_Builder.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -2332,6 +2350,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2486,24 +2507,24 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + Event/event_export.h \ + RtecEventCommC.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ Event/event_export.h Event/EC_Supplier_Filter_Builder.i .obj/EC_Trivial_Supplier_Filter.o .obj/EC_Trivial_Supplier_Filter.so .shobj/EC_Trivial_Supplier_Filter.o .shobj/EC_Trivial_Supplier_Filter.so: Event/EC_Trivial_Supplier_Filter.cpp \ Event/EC_Trivial_Supplier_Filter.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Supplier_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -2621,6 +2642,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2775,28 +2799,28 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.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 \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/event_export.h Event/EC_Supplier_Filter.i \ Event/EC_Supplier_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ Event/EC_Supplier_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.i \ Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \ Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -2810,54 +2834,54 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i Event/EC_ConsumerAdmin.h \ Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/EC_ConsumerAdmin.i Event/EC_QOS_Info.h Event/EC_QOS_Info.i \ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i .obj/EC_Filter.o .obj/EC_Filter.so .shobj/EC_Filter.o .shobj/EC_Filter.so: Event/EC_Filter.cpp Event/EC_Filter.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -2975,6 +2999,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3129,19 +3156,19 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i .obj/EC_Filter_Builder.o .obj/EC_Filter_Builder.so .shobj/EC_Filter_Builder.o .shobj/EC_Filter_Builder.so: Event/EC_Filter_Builder.cpp \ Event/EC_Filter_Builder.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -3259,6 +3286,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3413,23 +3443,23 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + Event/event_export.h \ + RtecEventCommC.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ Event/event_export.h Event/EC_Filter_Builder.i Event/EC_Filter.h \ Event/EC_Filter.i .obj/EC_Dispatching.o .obj/EC_Dispatching.so .shobj/EC_Dispatching.o .shobj/EC_Dispatching.so: Event/EC_Dispatching.cpp Event/EC_Dispatching.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -3547,6 +3577,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3701,17 +3734,17 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Dispatching.i Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -3725,39 +3758,39 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i .obj/EC_Factory.o .obj/EC_Factory.so .shobj/EC_Factory.o .shobj/EC_Factory.so: Event/EC_Factory.cpp Event/EC_Factory.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -3875,6 +3908,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4035,7 +4071,7 @@ realclean: clean .obj/EC_QOS_Info.o .obj/EC_QOS_Info.so .shobj/EC_QOS_Info.o .shobj/EC_QOS_Info.so: Event/EC_QOS_Info.cpp Event/EC_QOS_Info.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ + RtecBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -4153,6 +4189,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4307,13 +4346,13 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ + svc_utils_export.h \ + RtecBaseC.i \ Event/event_export.h Event/EC_QOS_Info.i .obj/EC_Null_Factory.o .obj/EC_Null_Factory.so .shobj/EC_Null_Factory.o .shobj/EC_Null_Factory.so: Event/EC_Null_Factory.cpp Event/EC_Null_Factory.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -4431,6 +4470,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4586,29 +4628,29 @@ realclean: clean $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ Event/EC_Factory.i Event/EC_Null_Factory.i Event/EC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + RtecEventCommC.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Dispatching.i Event/EC_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ Event/EC_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.h \ Event/EC_Supplier_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/EC_Supplier_Filter.i Event/EC_Supplier_Filter_Builder.h \ Event/EC_Supplier_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.i \ Event/EC_ConsumerAdmin.h Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -4622,46 +4664,46 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \ Event/EC_SupplierAdmin.i Event/EC_ObserverStrategy.h \ @@ -4681,17 +4723,17 @@ realclean: clean Event/EC_ConsumerControl.i Event/EC_SupplierControl.h \ Event/EC_SupplierControl.i Event/EC_Event_Channel.h \ Event/EC_Defaults.h Event/EC_Event_Channel.i \ - $(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_Immediate_Changes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp + ESF/ESF_Proxy_List.h \ + ESF/ESF_Proxy_List.i \ + ESF/ESF_Proxy_List.cpp \ + ESF/ESF_Immediate_Changes.h \ + ESF/ESF_Immediate_Changes.i \ + ESF/ESF_Immediate_Changes.cpp .obj/EC_Disjunction_Filter.o .obj/EC_Disjunction_Filter.so .shobj/EC_Disjunction_Filter.o .shobj/EC_Disjunction_Filter.so: Event/EC_Disjunction_Filter.cpp \ Event/EC_Disjunction_Filter.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -4809,6 +4851,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4963,19 +5008,19 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_Disjunction_Filter.i .obj/EC_Conjunction_Filter.o .obj/EC_Conjunction_Filter.so .shobj/EC_Conjunction_Filter.o .shobj/EC_Conjunction_Filter.so: Event/EC_Conjunction_Filter.cpp \ Event/EC_Conjunction_Filter.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -5093,6 +5138,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5247,19 +5295,19 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_Conjunction_Filter.i .obj/EC_Negation_Filter.o .obj/EC_Negation_Filter.so .shobj/EC_Negation_Filter.o .shobj/EC_Negation_Filter.so: Event/EC_Negation_Filter.cpp \ Event/EC_Negation_Filter.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -5377,6 +5425,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5531,18 +5582,18 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_Negation_Filter.i .obj/EC_Type_Filter.o .obj/EC_Type_Filter.so .shobj/EC_Type_Filter.o .shobj/EC_Type_Filter.so: Event/EC_Type_Filter.cpp Event/EC_Type_Filter.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -5660,6 +5711,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5814,17 +5868,17 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_Type_Filter.i .obj/EC_Basic_Filter_Builder.o .obj/EC_Basic_Filter_Builder.so .shobj/EC_Basic_Filter_Builder.o .shobj/EC_Basic_Filter_Builder.so: Event/EC_Basic_Filter_Builder.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + Event_Service_Constants.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -5907,8 +5961,8 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + Time_Utilities.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -5945,6 +5999,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6099,19 +6156,19 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + svc_utils_export.h \ + TimeBaseC.i \ + Time_Utilities.i \ Event/EC_Basic_Filter_Builder.h Event/EC_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + Event/event_export.h \ + RtecEventCommC.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ Event/event_export.h Event/EC_Filter_Builder.i \ Event/EC_Basic_Filter_Builder.i Event/EC_Type_Filter.h \ Event/EC_Filter.h Event/EC_Filter.i Event/EC_Type_Filter.i \ @@ -6126,7 +6183,7 @@ realclean: clean .obj/EC_Basic_Factory.o .obj/EC_Basic_Factory.so .shobj/EC_Basic_Factory.o .shobj/EC_Basic_Factory.so: Event/EC_Basic_Factory.cpp \ Event/EC_Basic_Factory.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -6244,6 +6301,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6399,30 +6459,30 @@ realclean: clean $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ Event/EC_Factory.i Event/EC_Basic_Factory.i Event/EC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + RtecEventCommC.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Dispatching.i \ Event/EC_Basic_Filter_Builder.h Event/EC_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ Event/EC_Filter_Builder.i Event/EC_Basic_Filter_Builder.i \ Event/EC_Trivial_Supplier_Filter.h Event/EC_Supplier_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/EC_Supplier_Filter.i Event/EC_Supplier_Filter_Builder.h \ Event/EC_Supplier_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.i \ Event/EC_ConsumerAdmin.h Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -6436,46 +6496,46 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \ Event/EC_SupplierAdmin.i Event/EC_ObserverStrategy.h \ @@ -6497,24 +6557,24 @@ realclean: clean Event/EC_Reactive_SupplierControl.h Event/EC_SupplierControl.h \ Event/EC_SupplierControl.i Event/EC_Reactive_SupplierControl.i \ Event/EC_Event_Channel.h Event/EC_Defaults.h Event/EC_Event_Channel.i \ - $(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_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 + ESF/ESF_Proxy_List.h \ + ESF/ESF_Proxy_List.i \ + ESF/ESF_Proxy_List.cpp \ + ESF/ESF_Delayed_Changes.h \ + ESF/ESF_Busy_Lock.h \ + ESF/ESF_Busy_Lock.i \ + ESF/ESF_Busy_Lock.cpp \ + ESF/ESF_Delayed_Changes.i \ + ESF/ESF_Delayed_Changes.cpp \ + ESF/ESF_Defaults.h \ + ESF/ESF_Delayed_Command.h \ + ESF/ESF_Delayed_Command.i \ + ESF/ESF_Delayed_Command.cpp .obj/EC_Default_Factory.o .obj/EC_Default_Factory.so .shobj/EC_Default_Factory.o .shobj/EC_Default_Factory.so: Event/EC_Default_Factory.cpp \ Event/EC_Default_Factory.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -6632,6 +6692,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6788,18 +6851,18 @@ realclean: clean $(TAO_ROOT)/tao/BoundsC.i \ Event/EC_Factory.i Event/EC_Defaults.h Event/EC_Default_Factory.i \ Event/EC_MT_Dispatching.h Event/EC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + RtecEventCommC.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Dispatching.i \ Event/EC_Dispatching_Task.h Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -6813,34 +6876,34 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ @@ -6857,24 +6920,24 @@ realclean: clean Event/EC_Filter_Builder.i Event/EC_Basic_Filter_Builder.i \ Event/EC_Prefix_Filter_Builder.h Event/EC_Prefix_Filter_Builder.i \ Event/EC_ConsumerAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \ Event/EC_SupplierAdmin.i Event/EC_Trivial_Supplier_Filter.h \ @@ -6900,31 +6963,31 @@ realclean: clean Event/EC_Reactive_ConsumerControl.i \ Event/EC_Reactive_SupplierControl.h Event/EC_SupplierControl.h \ Event/EC_SupplierControl.i Event/EC_Reactive_SupplierControl.i \ - $(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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp \ - $(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_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_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_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 \ + ESF/ESF_Proxy_List.h \ + ESF/ESF_Proxy_List.i \ + ESF/ESF_Proxy_List.cpp \ + ESF/ESF_Proxy_RB_Tree.h \ + ESF/ESF_Proxy_RB_Tree.i \ + ESF/ESF_Proxy_RB_Tree.cpp \ + ESF/ESF_Immediate_Changes.h \ + ESF/ESF_Immediate_Changes.i \ + ESF/ESF_Immediate_Changes.cpp \ + ESF/ESF_Copy_On_Read.h \ + ESF/ESF_Copy_On_Read.i \ + ESF/ESF_Copy_On_Read.cpp \ + ESF/ESF_Copy_On_Write.h \ + ESF/ESF_Copy_On_Write.i \ + ESF/ESF_Copy_On_Write.cpp \ + 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 \ $(ACE_ROOT)/ace/Arg_Shifter.h \ $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/Sched_Params.i @@ -6932,7 +6995,7 @@ realclean: clean .obj/EC_ObserverStrategy.o .obj/EC_ObserverStrategy.so .shobj/EC_ObserverStrategy.o .shobj/EC_ObserverStrategy.so: Event/EC_ObserverStrategy.cpp \ Event/EC_ObserverStrategy.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + ESF/ESF_Worker.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -7050,6 +7113,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -7204,32 +7270,32 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/RB_Tree.i \ $(ACE_ROOT)/ace/RB_Tree.cpp \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + Event/event_export.h \ + RtecEventCommC.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ Event/event_export.h Event/EC_ObserverStrategy.i \ Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \ Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -7243,53 +7309,53 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i Event/EC_ProxyConsumer.h \ Event/EC_ProxyConsumer.i Event/EC_ConsumerAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \ Event/EC_SupplierAdmin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp @@ -7298,7 +7364,7 @@ realclean: clean Event/EC_Per_Supplier_Filter.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Supplier_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -7416,6 +7482,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -7570,28 +7639,28 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.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 \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/event_export.h Event/EC_Supplier_Filter.i \ Event/EC_Supplier_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ Event/EC_Supplier_Filter_Builder.i Event/EC_Per_Supplier_Filter.i \ Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \ Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -7605,46 +7674,46 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i Event/EC_ProxyConsumer.h \ Event/EC_ProxyConsumer.i Event/EC_Scheduling_Strategy.h \ Event/EC_Scheduling_Strategy.i Event/EC_QOS_Info.h \ Event/EC_QOS_Info.i \ - $(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/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i .obj/EC_Timeout_Filter.o .obj/EC_Timeout_Filter.so .shobj/EC_Timeout_Filter.o .shobj/EC_Timeout_Filter.so: Event/EC_Timeout_Filter.cpp \ Event/EC_Timeout_Filter.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -7762,6 +7831,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -7916,23 +7988,23 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_QOS_Info.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \ Event/EC_Timeout_Generator.h Event/EC_Timeout_Generator.i \ Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \ Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -7946,41 +8018,41 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ + Event/EC_Filter.h \ Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h + Time_Utilities.h \ + Time_Utilities.i \ + Event_Service_Constants.h .obj/EC_Timeout_Generator.o .obj/EC_Timeout_Generator.so .shobj/EC_Timeout_Generator.o .shobj/EC_Timeout_Generator.so: Event/EC_Timeout_Generator.cpp \ Event/EC_Timeout_Generator.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -8006,7 +8078,7 @@ realclean: clean $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Event_Handler.i \ Event/EC_Timeout_Filter.h Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -8100,6 +8172,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -8254,27 +8329,27 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_QOS_Info.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \ Event/EC_Timeout_Generator.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i .obj/EC_Reactive_Timeout_Generator.o .obj/EC_Reactive_Timeout_Generator.so .shobj/EC_Reactive_Timeout_Generator.o .shobj/EC_Reactive_Timeout_Generator.so: \ Event/EC_Reactive_Timeout_Generator.cpp \ Event/EC_Reactive_Timeout_Generator.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Timeout_Generator.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -8300,7 +8375,7 @@ realclean: clean $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Event_Handler.i \ Event/EC_Timeout_Filter.h Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -8394,6 +8469,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -8548,22 +8626,22 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_QOS_Info.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \ Event/EC_Timeout_Generator.i Event/EC_Reactive_Timeout_Generator.i .obj/EC_MT_Dispatching.o .obj/EC_MT_Dispatching.so .shobj/EC_MT_Dispatching.o .shobj/EC_MT_Dispatching.so: Event/EC_MT_Dispatching.cpp \ Event/EC_MT_Dispatching.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -8681,6 +8759,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -8835,18 +8916,18 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Dispatching.i \ Event/EC_Dispatching_Task.h Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -8860,34 +8941,34 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ @@ -8905,9 +8986,9 @@ realclean: clean Event/EC_Dispatching_Task.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -9008,6 +9089,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -9019,7 +9103,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -9185,8 +9269,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -9195,39 +9279,39 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i Event/event_export.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ @@ -9244,7 +9328,7 @@ realclean: clean .obj/EC_Scheduling_Strategy.o .obj/EC_Scheduling_Strategy.so .shobj/EC_Scheduling_Strategy.o .shobj/EC_Scheduling_Strategy.so: Event/EC_Scheduling_Strategy.cpp \ Event/EC_Scheduling_Strategy.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ + RtecBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -9362,6 +9446,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -9516,15 +9603,15 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + svc_utils_export.h \ + RtecBaseC.i \ + RtecEventCommC.h \ + Event/event_export.h \ + TimeBaseC.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/EC_Scheduling_Strategy.i Event/EC_QOS_Info.h \ Event/event_export.h Event/EC_QOS_Info.i @@ -9532,7 +9619,7 @@ realclean: clean Event/EC_Null_Scheduling.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Scheduling_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ + RtecBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -9650,6 +9737,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -9804,22 +9894,22 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + svc_utils_export.h \ + RtecBaseC.i \ + RtecEventCommC.h \ + Event/event_export.h \ + TimeBaseC.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/EC_Scheduling_Strategy.i Event/event_export.h \ Event/EC_Null_Scheduling.i Event/EC_QOS_Info.h Event/EC_QOS_Info.i .obj/EC_ConsumerControl.o .obj/EC_ConsumerControl.so .shobj/EC_ConsumerControl.o .shobj/EC_ConsumerControl.so: Event/EC_ConsumerControl.cpp \ Event/EC_ConsumerControl.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -9937,6 +10027,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -10096,7 +10189,7 @@ realclean: clean .obj/EC_SupplierControl.o .obj/EC_SupplierControl.so .shobj/EC_SupplierControl.o .shobj/EC_SupplierControl.so: Event/EC_SupplierControl.cpp \ Event/EC_SupplierControl.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -10214,6 +10307,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -10374,7 +10470,7 @@ realclean: clean Event/EC_Reactive_ConsumerControl.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_ConsumerControl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -10492,6 +10588,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -10647,22 +10746,22 @@ realclean: clean $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ Event/EC_ConsumerControl.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 \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/EC_Reactive_ConsumerControl.i Event/EC_Event_Channel.h \ Event/EC_Factory.h Event/EC_Factory.i Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -10671,56 +10770,56 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i Event/EC_ConsumerAdmin.h \ Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/event_export.h Event/EC_ConsumerAdmin.i \ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i @@ -10728,7 +10827,7 @@ realclean: clean Event/EC_Reactive_SupplierControl.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_SupplierControl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -10846,6 +10945,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -11001,22 +11103,22 @@ realclean: clean $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ Event/EC_SupplierControl.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 \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/EC_Reactive_SupplierControl.i Event/EC_Event_Channel.h \ Event/EC_Factory.h Event/EC_Factory.i Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -11025,63 +11127,63 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i Event/EC_SupplierAdmin.h \ Event/EC_ProxyConsumer.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxyConsumer.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(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 \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/event_export.h Event/EC_SupplierAdmin.i \ Event/EC_ProxySupplier.h Event/EC_ProxySupplier.i .obj/EC_Bitmask_Filter.o .obj/EC_Bitmask_Filter.so .shobj/EC_Bitmask_Filter.o .shobj/EC_Bitmask_Filter.so: Event/EC_Bitmask_Filter.cpp \ Event/EC_Bitmask_Filter.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -11199,6 +11301,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -11353,19 +11458,19 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_Bitmask_Filter.i .obj/EC_Masked_Type_Filter.o .obj/EC_Masked_Type_Filter.so .shobj/EC_Masked_Type_Filter.o .shobj/EC_Masked_Type_Filter.so: Event/EC_Masked_Type_Filter.cpp \ Event/EC_Masked_Type_Filter.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -11483,6 +11588,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -11637,17 +11745,17 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_Masked_Type_Filter.i .obj/EC_Prefix_Filter_Builder.o .obj/EC_Prefix_Filter_Builder.so .shobj/EC_Prefix_Filter_Builder.o .shobj/EC_Prefix_Filter_Builder.so: Event/EC_Prefix_Filter_Builder.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + Event_Service_Constants.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -11730,8 +11838,8 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + Time_Utilities.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -11768,6 +11876,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -11922,19 +12033,19 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + svc_utils_export.h \ + TimeBaseC.i \ + Time_Utilities.i \ Event/EC_Prefix_Filter_Builder.h Event/EC_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + Event/event_export.h \ + RtecEventCommC.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ Event/event_export.h Event/EC_Filter_Builder.i \ Event/EC_Prefix_Filter_Builder.i Event/EC_Type_Filter.h \ Event/EC_Filter.h Event/EC_Filter.i Event/EC_Type_Filter.i \ @@ -11949,7 +12060,7 @@ realclean: clean .obj/EC_And_Filter.o .obj/EC_And_Filter.so .shobj/EC_And_Filter.o .shobj/EC_And_Filter.so: Event/EC_And_Filter.cpp Event/EC_And_Filter.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -12067,6 +12178,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -12221,19 +12335,19 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_And_Filter.i .obj/Event_Utilities.o .obj/Event_Utilities.so .shobj/Event_Utilities.o .shobj/Event_Utilities.so: Event_Utilities.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ + Event_Utilities.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -12351,6 +12465,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -12505,26 +12622,26 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i + Event/event_export.h \ + RtecEventCommC.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecEventChannelAdminC.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ + Event_Utilities.i .obj/EC_Gateway.o .obj/EC_Gateway.so .shobj/EC_Gateway.o .shobj/EC_Gateway.so: Event/EC_Gateway.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway.h \ + Event/EC_Gateway.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -12545,9 +12662,9 @@ realclean: clean $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -12628,6 +12745,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -12639,7 +12759,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -12805,8 +12925,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -12815,51 +12935,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Channel_Clients.h \ + Channel_Clients_T.h \ + Channel_Clients_T.i \ + Channel_Clients_T.cpp \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i + Event_Utilities.h \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ + Event_Utilities.i .obj/EC_Gateway_UDP.o .obj/EC_Gateway_UDP.so .shobj/EC_Gateway_UDP.o .shobj/EC_Gateway_UDP.so: Event/EC_Gateway_UDP.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h \ + Event/EC_Gateway_UDP.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_IO.h \ @@ -12900,9 +13020,9 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -12981,6 +13101,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -12992,7 +13115,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -13158,8 +13281,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -13168,57 +13291,57 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + RtecUDPAdminS.h \ + RtecUDPAdminC.h \ + RtecUDPAdminC.i \ + RtecUDPAdminS_T.h \ + RtecUDPAdminS_T.i \ + RtecUDPAdminS_T.cpp \ + RtecUDPAdminS.i \ + Event/EC_Gateway_UDP.i \ + Event_Utilities.h \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ + Event_Utilities.i .obj/EC_UDP_Admin.o .obj/EC_UDP_Admin.so .shobj/EC_UDP_Admin.o .shobj/EC_UDP_Admin.so: Event/EC_UDP_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h \ + Event/EC_UDP_Admin.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecUDPAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -13319,6 +13442,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -13330,7 +13456,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -13496,8 +13622,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -13506,30 +13632,30 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.i + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecUDPAdminC.h \ + RtecUDPAdminC.i \ + RtecUDPAdminS_T.h \ + RtecUDPAdminS_T.i \ + RtecUDPAdminS_T.cpp \ + RtecUDPAdminS.i .obj/RtecDefaultEventDataS.o .obj/RtecDefaultEventDataS.so .shobj/RtecDefaultEventDataS.o .shobj/RtecDefaultEventDataS.so: RtecDefaultEventDataS.cpp \ RtecDefaultEventDataS.h \ @@ -13652,6 +13778,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -13944,6 +14073,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -14264,6 +14396,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -14587,6 +14722,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -14925,6 +15063,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -15200,6 +15341,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -15477,6 +15621,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -15754,6 +15901,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTOLDEvent b/TAO/orbsvcs/orbsvcs/Makefile.RTOLDEvent index a24de4f6d0b..e33435f8ea5 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.RTOLDEvent +++ b/TAO/orbsvcs/orbsvcs/Makefile.RTOLDEvent @@ -119,8 +119,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Sched_Params.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + Scheduler_Factory.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -218,6 +218,9 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -372,29 +375,29 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ + Time_Utilities.h \ + Time_Utilities.i \ Event/Memory_Pools.h Event/Event_Channel.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Event/Local_ESTypes.h \ + Event_Service_Constants.h \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -408,44 +411,44 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + RtecEventCommC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecEventCommS.h \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/Local_ESTypes.i \ + Event/Timer_Module.h \ + Event/RT_Task.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -456,11 +459,11 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/old_event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \ + Event/old_event_export.h \ + Event/RT_Task.i \ + Event/Timer_Module.i \ + Event/ReactorTask.h \ + Event/Fast_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor_T.h \ $(ACE_ROOT)/ace/Select_Reactor_Base.h \ @@ -477,10 +480,10 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Timer_List.h \ $(ACE_ROOT)/ace/Timer_List_T.h \ $(ACE_ROOT)/ace/Timer_List_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i \ + Event/Event_Manip.h \ + Event/Event_Manip.i \ Event/Event_Channel.i Event/Dispatching_Modules.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.h \ + Event/Event_Channel.h \ Event/Dispatching_Modules.i Event/Memory_Pools.i .obj/Event_Channel.o .obj/Event_Channel.so .shobj/Event_Channel.o .shobj/Event_Channel.so: Event/Event_Channel.cpp \ @@ -582,8 +585,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + Scheduler_Factory.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -625,6 +628,9 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -761,34 +767,34 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Dispatching_Modules.h \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ + Event_Utilities.h \ + RtecEventChannelAdminC.h \ + Event/event_export.h \ + RtecEventCommC.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecEventChannelAdminC.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ + Event_Utilities.i \ + Event/Dispatching_Modules.h \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \ + Event/ReactorTask.h \ + Event/Fast_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor_T.h \ $(ACE_ROOT)/ace/Select_Reactor_Base.h \ @@ -802,13 +808,13 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Timer_Heap_T.h \ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ $(ACE_ROOT)/ace/Select_Reactor_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/old_event_export.h \ + Event/old_event_export.h \ $(ACE_ROOT)/ace/Timer_List.h \ $(ACE_ROOT)/ace/Timer_List_T.h \ $(ACE_ROOT)/ace/Timer_List_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Event/Local_ESTypes.h \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -822,36 +828,36 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + RtecEventCommS.h \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/Local_ESTypes.i \ + Event/RT_Task.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -862,30 +868,30 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.h \ + Event/RT_Task.i \ + Event/Event_Manip.h \ + Event/Event_Manip.i \ + Event/Event_Channel.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Dispatching_Modules.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Memory_Pools.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Memory_Pools.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Module_Factory.h + Event/Timer_Module.h \ + Event/Timer_Module.i \ + Event/Event_Channel.i \ + Event/Dispatching_Modules.i \ + Event/Memory_Pools.h \ + Event/Memory_Pools.i \ + Event/EC_Gateway.h \ + Channel_Clients.h \ + Channel_Clients_T.h \ + Channel_Clients_T.i \ + Channel_Clients_T.cpp \ + Event/Module_Factory.h .obj/Event_Manip.o .obj/Event_Manip.so .shobj/Event_Manip.o .shobj/Event_Manip.so: Event/Event_Manip.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \ + Event/Event_Manip.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1003,6 +1009,9 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1157,15 +1166,15 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/old_event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + Event/old_event_export.h \ + Event/Event_Manip.i .obj/Local_ESTypes.o .obj/Local_ESTypes.so .shobj/Local_ESTypes.o .shobj/Local_ESTypes.so: Event/Local_ESTypes.cpp Event/Local_ESTypes.h \ $(ACE_ROOT)/ace/pre.h \ @@ -1286,6 +1295,9 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1440,22 +1452,22 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Event_Service_Constants.h \ + Time_Utilities.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + Time_Utilities.i \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -1469,41 +1481,41 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + RtecEventCommC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecEventCommS.h \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/Local_ESTypes.i .obj/Memory_Pools.o .obj/Memory_Pools.so .shobj/Memory_Pools.o .shobj/Memory_Pools.so: Event/Memory_Pools.cpp Event/Memory_Pools.h \ @@ -1613,8 +1625,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Functor_T.cpp \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + Scheduler_Factory.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1656,6 +1668,9 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1787,23 +1802,23 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ + Event/Local_ESTypes.h \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -1817,44 +1832,44 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + RtecEventCommC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecEventCommS.h \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/Local_ESTypes.i \ + Event/Timer_Module.h \ + Event/RT_Task.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1865,11 +1880,11 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/old_event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \ + Event/old_event_export.h \ + Event/RT_Task.i \ + Event/Timer_Module.i \ + Event/ReactorTask.h \ + Event/Fast_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor_T.h \ $(ACE_ROOT)/ace/Select_Reactor_Base.h \ @@ -1886,10 +1901,10 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Timer_List.h \ $(ACE_ROOT)/ace/Timer_List_T.h \ $(ACE_ROOT)/ace/Timer_List_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i \ + Event/Event_Manip.h \ + Event/Event_Manip.i \ Event/Event_Channel.i Event/Dispatching_Modules.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.h \ + Event/Event_Channel.h \ Event/Dispatching_Modules.i Event/Memory_Pools.i .obj/RT_Task.o .obj/RT_Task.so .shobj/RT_Task.o .shobj/RT_Task.so: Event/RT_Task.cpp \ @@ -1916,8 +1931,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Sched_Params.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + Scheduler_Factory.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2015,6 +2030,9 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2169,17 +2187,17 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ Event/RT_Task.h $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -2197,12 +2215,12 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Map_Manager.cpp \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Event/Local_ESTypes.h \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -2216,47 +2234,47 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + RtecEventCommC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecEventCommS.h \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/Local_ESTypes.i \ + Event/Timer_Module.h \ + Event/RT_Task.h \ + Event/Timer_Module.i \ + Event/ReactorTask.h \ + Event/Fast_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor_T.h \ $(ACE_ROOT)/ace/Select_Reactor_Base.h \ @@ -2270,15 +2288,15 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Timer_Heap_T.h \ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ $(ACE_ROOT)/ace/Select_Reactor_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/old_event_export.h \ + Event/old_event_export.h \ $(ACE_ROOT)/ace/Timer_List.h \ $(ACE_ROOT)/ace/Timer_List_T.h \ $(ACE_ROOT)/ace/Timer_List_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i \ + Event/Event_Manip.h \ + Event/Event_Manip.i \ Event/Event_Channel.i Event/Memory_Pools.h \ Event/Dispatching_Modules.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.h \ + Event/Event_Channel.h \ Event/Dispatching_Modules.i Event/Memory_Pools.i .obj/ReactorTask.o .obj/ReactorTask.so .shobj/ReactorTask.o .shobj/ReactorTask.so: Event/ReactorTask.cpp \ @@ -2309,8 +2327,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/High_Res_Timer.i \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + Scheduler_Factory.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2406,6 +2424,9 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2560,17 +2581,17 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ Event/ReactorTask.h Event/Fast_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor_T.h \ @@ -2590,11 +2611,11 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Timer_List_T.h \ $(ACE_ROOT)/ace/Timer_List_T.cpp \ Event/Local_ESTypes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -2608,41 +2629,41 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + RtecEventCommC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecEventCommS.h \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/Local_ESTypes.i Event/RT_Task.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ @@ -2685,8 +2706,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + Scheduler_Factory.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2782,6 +2803,9 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2931,17 +2955,17 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ Event/ReactorTask.h Event/Fast_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor_T.h \ @@ -2961,11 +2985,11 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Timer_List_T.h \ $(ACE_ROOT)/ace/Timer_List_T.cpp \ Event/Local_ESTypes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -2979,41 +3003,41 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + RtecEventCommC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecEventCommS.h \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/Local_ESTypes.i Event/RT_Task.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ @@ -3026,13 +3050,13 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ Event/RT_Task.i Event/Timer_Module.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \ + Event/RT_Task.h \ Event/Timer_Module.i \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h .obj/Module_Factory.o .obj/Module_Factory.so .shobj/Module_Factory.o .shobj/Module_Factory.so: Event/Module_Factory.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Dispatching_Modules.h \ + Event/Dispatching_Modules.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/post.h \ @@ -3056,8 +3080,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \ + Event/ReactorTask.h \ + Event/Fast_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor_T.h \ $(ACE_ROOT)/ace/Select_Reactor_Base.h \ @@ -3136,11 +3160,11 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Timer_Heap_T.h \ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ $(ACE_ROOT)/ace/Select_Reactor_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/old_event_export.h \ + Event/old_event_export.h \ $(ACE_ROOT)/ace/Timer_List.h \ $(ACE_ROOT)/ace/Timer_List_T.h \ $(ACE_ROOT)/ace/Timer_List_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \ + Event/Local_ESTypes.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -3182,6 +3206,9 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3327,22 +3354,22 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Event_Service_Constants.h \ + Time_Utilities.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + Time_Utilities.i \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -3356,43 +3383,43 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + RtecEventCommC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ + RtecEventCommS.h \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/Local_ESTypes.i \ + Event/RT_Task.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -3403,19 +3430,19 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.h \ + Event/RT_Task.i \ + Event/Event_Manip.h \ + Event/Event_Manip.i \ + Event/Event_Channel.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Dispatching_Modules.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Module_Factory.h + Scheduler_Factory.h \ + Scheduler_Factory.i \ + Event/Timer_Module.h \ + Event/Timer_Module.i \ + Event/Event_Channel.i \ + Event/Dispatching_Modules.i \ + Event/Module_Factory.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTSched b/TAO/orbsvcs/orbsvcs/Makefile.RTSched index cffd151cfc5..1f1d4222e60 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.RTSched +++ b/TAO/orbsvcs/orbsvcs/Makefile.RTSched @@ -142,9 +142,9 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + Runtime_Scheduler.h \ + Scheduler_Factory.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -210,6 +210,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -364,19 +367,19 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -390,25 +393,25 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.i + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + Runtime_Scheduler.i .obj/Runtime_Scheduler.o .obj/Runtime_Scheduler.so .shobj/Runtime_Scheduler.o .shobj/Runtime_Scheduler.so: Runtime_Scheduler.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + Time_Utilities.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -526,6 +529,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -680,22 +686,22 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + svc_utils_export.h \ + TimeBaseC.i \ + Time_Utilities.i \ + Runtime_Scheduler.h \ + Scheduler_Factory.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -709,20 +715,20 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.i + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + Runtime_Scheduler.i .obj/Scheduler_Utilities.o .obj/Scheduler_Utilities.so .shobj/Scheduler_Utilities.o .shobj/Scheduler_Utilities.so: Scheduler_Utilities.cpp \ $(ACE_ROOT)/ace/OS.h \ @@ -746,8 +752,8 @@ realclean: clean $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + Scheduler_Utilities.h \ + RtecSchedulerC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -845,6 +851,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -999,19 +1008,19 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Utilities.i + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Utilities.i .obj/Config_Scheduler.o .obj/Config_Scheduler.so .shobj/Config_Scheduler.o .shobj/Config_Scheduler.so: Sched/Config_Scheduler.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + Time_Utilities.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1129,6 +1138,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1283,22 +1295,22 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ + svc_utils_export.h \ + TimeBaseC.i \ + Time_Utilities.i \ + Scheduler_Factory.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ Sched/Config_Scheduler.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -1312,28 +1324,28 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + Event_Service_Constants.h \ Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.h \ + Sched/Scheduler_Generic.h \ + Sched/Scheduler.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i \ + Sched/Scheduler.i \ + Sched/Scheduler_Generic.i \ Sched/Config_Scheduler.i .obj/DynSched.o .obj/DynSched.so .shobj/DynSched.o .shobj/DynSched.so: Sched/DynSched.cpp Sched/DynSched.h \ @@ -1441,7 +1453,7 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ Sched/SchedEntry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + RtecSchedulerC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1478,6 +1490,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1614,16 +1629,16 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ Sched/sched_export.h Sched/SchedEntry.i Sched/DynSched.i \ $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/Sched_Params.i @@ -1738,8 +1753,8 @@ realclean: clean $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/RB_Tree.i \ $(ACE_ROOT)/ace/RB_Tree.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + Scheduler_Factory.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1781,6 +1796,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1908,19 +1926,19 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -1934,19 +1952,19 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ Sched/Reconfig_Sched_Utils.h Sched/sched_export.h \ Sched/Reconfig_Sched_Utils.i Sched/Reconfig_Sched_Utils_T.h \ Sched/Reconfig_Sched_Utils_T.i Sched/Reconfig_Sched_Utils_T.cpp \ @@ -1954,8 +1972,8 @@ realclean: clean $(ACE_ROOT)/ace/Sched_Params.i \ Sched/Reconfig_Scheduler.i Sched/Reconfig_Scheduler_T.i \ Sched/Reconfig_Scheduler_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + Time_Utilities.h \ + Time_Utilities.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp @@ -1968,7 +1986,7 @@ realclean: clean $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ Sched/Reconfig_Sched_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ + Scheduler_Factory.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -1985,7 +2003,7 @@ realclean: clean $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2083,6 +2101,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2237,19 +2258,19 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -2263,29 +2284,29 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ Sched/sched_export.h Sched/Reconfig_Sched_Utils.i \ Sched/Reconfig_Sched_Utils_T.i Sched/Reconfig_Sched_Utils_T.cpp \ $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/Sched_Params.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i + Time_Utilities.h \ + Time_Utilities.i .obj/SchedEntry.o .obj/SchedEntry.so .shobj/SchedEntry.o .shobj/SchedEntry.so: Sched/SchedEntry.cpp Sched/SchedEntry.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + RtecSchedulerC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -2403,6 +2424,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2557,16 +2581,16 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ Sched/sched_export.h Sched/SchedEntry.i .obj/Scheduler.o .obj/Scheduler.so .shobj/Scheduler.o .shobj/Scheduler.so: Sched/Scheduler.cpp \ @@ -2593,8 +2617,8 @@ realclean: clean $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Sched_Params.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + Time_Utilities.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2692,6 +2716,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2846,19 +2873,19 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + svc_utils_export.h \ + TimeBaseC.i \ + Time_Utilities.i \ Sched/Scheduler.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Event_Service_Constants.h \ Sched/sched_export.h Sched/Scheduler.i .obj/Scheduler_Generic.o .obj/Scheduler_Generic.so .shobj/Scheduler_Generic.o .shobj/Scheduler_Generic.so: Sched/Scheduler_Generic.cpp \ @@ -2968,7 +2995,7 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + RtecSchedulerC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -3005,6 +3032,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3141,16 +3171,16 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ Sched/sched_export.h Sched/Scheduler.i Sched/Scheduler_Generic.i .obj/Strategy_Scheduler.o .obj/Strategy_Scheduler.so .shobj/Strategy_Scheduler.o .shobj/Strategy_Scheduler.so: Sched/Strategy_Scheduler.cpp \ @@ -3259,7 +3289,7 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ Sched/SchedEntry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + RtecSchedulerC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -3296,6 +3326,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3432,16 +3465,16 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ Sched/sched_export.h Sched/SchedEntry.i Sched/DynSched.i \ Sched/Strategy_Scheduler.i \ $(ACE_ROOT)/ace/Sched_Params.h \ @@ -3549,6 +3582,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -3883,6 +3919,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTSchedEvent b/TAO/orbsvcs/orbsvcs/Makefile.RTSchedEvent index 31432d724bd..3d16bd953a9 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.RTSchedEvent +++ b/TAO/orbsvcs/orbsvcs/Makefile.RTSchedEvent @@ -82,7 +82,7 @@ realclean: clean .obj/EC_Sched_Filter.o .obj/EC_Sched_Filter.so .shobj/EC_Sched_Filter.o .shobj/EC_Sched_Filter.so: Event/EC_Sched_Filter.cpp Event/EC_Sched_Filter.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -200,6 +200,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -354,26 +357,26 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ Event/sched_event_export.h Event/EC_Sched_Filter.i \ Event/EC_QOS_Info.h Event/EC_QOS_Info.i .obj/EC_Sched_Filter_Builder.o .obj/EC_Sched_Filter_Builder.so .shobj/EC_Sched_Filter_Builder.o .shobj/EC_Sched_Filter_Builder.so: Event/EC_Sched_Filter_Builder.cpp \ Event/EC_Sched_Filter.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -491,6 +494,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -645,26 +651,26 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ Event/sched_event_export.h Event/EC_Sched_Filter.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ Event/EC_Sched_Filter_Builder.h Event/EC_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ Event/EC_Filter_Builder.i Event/EC_Sched_Filter_Builder.i \ Event/EC_Type_Filter.h Event/EC_Type_Filter.i \ Event/EC_Conjunction_Filter.h Event/EC_Conjunction_Filter.i \ @@ -672,9 +678,9 @@ realclean: clean Event/EC_Timeout_Filter.h Event/EC_QOS_Info.h Event/EC_QOS_Info.i \ Event/EC_Timeout_Filter.i Event/EC_Event_Channel.h Event/EC_Factory.h \ Event/EC_Factory.i Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -688,35 +694,35 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i .obj/EC_Priority_Scheduling.o .obj/EC_Priority_Scheduling.so .shobj/EC_Priority_Scheduling.o .shobj/EC_Priority_Scheduling.so: Event/EC_Priority_Scheduling.cpp \ Event/EC_Priority_Scheduling.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Scheduling_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ + RtecBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -834,6 +840,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -988,25 +997,25 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + svc_utils_export.h \ + RtecBaseC.i \ + RtecEventCommC.h \ + Event/event_export.h \ + TimeBaseC.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/EC_Scheduling_Strategy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecSchedulerC.i \ Event/sched_event_export.h Event/EC_Priority_Scheduling.i \ Event/EC_QOS_Info.h Event/event_export.h Event/EC_QOS_Info.i \ Event/EC_ProxyConsumer.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -1020,39 +1029,39 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxyConsumer.i Event/EC_ProxySupplier.h \ Event/EC_ProxySupplier.i .obj/EC_Priority_Dispatching.o .obj/EC_Priority_Dispatching.so .shobj/EC_Priority_Dispatching.o .shobj/EC_Priority_Dispatching.so: Event/EC_Priority_Dispatching.cpp \ Event/EC_Priority_Dispatching.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1170,6 +1179,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1324,24 +1336,24 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Dispatching.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ Event/sched_event_export.h Event/EC_Priority_Dispatching.i \ Event/EC_Dispatching_Task.h Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -1355,32 +1367,32 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ @@ -1395,9 +1407,9 @@ realclean: clean Event/EC_Dispatching_Task.i Event/EC_Event_Channel.h \ Event/EC_Factory.h Event/EC_Factory.i Event/EC_Defaults.h \ Event/EC_Event_Channel.i Event/EC_QOS_Info.h Event/EC_QOS_Info.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/Sched_Params.i @@ -1405,7 +1417,7 @@ realclean: clean Event/EC_Sched_Factory.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Default_Factory.h Event/EC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1523,6 +1535,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1680,30 +1695,30 @@ realclean: clean Event/EC_Factory.i Event/EC_Defaults.h Event/EC_Default_Factory.i \ Event/sched_event_export.h Event/EC_Sched_Factory.i \ Event/EC_Priority_Dispatching.h Event/EC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + RtecEventCommC.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Dispatching.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ Event/EC_Priority_Dispatching.i Event/EC_Priority_Scheduling.h \ Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \ Event/EC_Priority_Scheduling.i Event/EC_Sched_Filter_Builder.h \ Event/EC_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ Event/EC_Filter_Builder.i Event/EC_Sched_Filter_Builder.i \ Event/EC_Event_Channel.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -1717,28 +1732,28 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i \ $(ACE_ROOT)/ace/Arg_Shifter.h \ $(ACE_ROOT)/ace/Sched_Params.h \ @@ -1747,7 +1762,7 @@ realclean: clean .obj/EC_Gateway_Sched.o .obj/EC_Gateway_Sched.so .shobj/EC_Gateway_Sched.o .shobj/EC_Gateway_Sched.so: Event/EC_Gateway_Sched.cpp \ Event/EC_Gateway_Sched.h \ $(ACE_ROOT)/ace/pre.h Event/EC_Gateway.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1768,9 +1783,9 @@ realclean: clean $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -1851,6 +1866,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -1862,7 +1880,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -2028,8 +2046,8 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2038,48 +2056,48 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Channel_Clients.h \ + Channel_Clients_T.h \ + Channel_Clients_T.i \ + Channel_Clients_T.cpp \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecSchedulerC.i \ Event/sched_event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i + Time_Utilities.h \ + Time_Utilities.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP b/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP index ee673fc799c..76eed45438e 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP +++ b/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP @@ -326,6 +326,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/DynamicC.i \ @@ -373,7 +376,7 @@ realclean: clean $(TAO_ROOT)/tao/Connector_Registry.i \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/IIOP_Acceptor.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.h \ + SSLIOPC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -419,11 +422,11 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Security/security_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.i \ + SSLIOP/SSLIOP_Export.h \ + SecurityC.h \ + Security/security_export.h \ + SecurityC.i \ + SSLIOPC.i \ SSLIOP/SSLIOP_Connect.h \ $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -590,6 +593,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -616,7 +622,7 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ SSLIOP/SSLIOP_Export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.h \ + SSLIOPC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -747,11 +753,11 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Security/security_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.i \ + SSLIOP/SSLIOP_Export.h \ + SecurityC.h \ + Security/security_export.h \ + SecurityC.i \ + SSLIOPC.i \ SSLIOP/SSLIOP_Endpoint.i \ $(TAO_ROOT)/tao/IIOP_Profile.h \ $(TAO_ROOT)/tao/IIOP_Endpoint.h \ @@ -884,6 +890,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -910,7 +919,7 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ SSLIOP/SSLIOP_Export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.h \ + SSLIOPC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -1041,11 +1050,11 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Security/security_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.i \ + SSLIOP/SSLIOP_Export.h \ + SecurityC.h \ + Security/security_export.h \ + SecurityC.i \ + SSLIOPC.i \ SSLIOP/SSLIOP_Endpoint.i SSLIOP/SSLIOP_Connect.h \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.h \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -1335,6 +1344,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/DynamicC.i \ @@ -1356,7 +1368,7 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.h \ + SSLIOPC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -1425,11 +1437,11 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Security/security_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.i \ + SSLIOP/SSLIOP_Export.h \ + SecurityC.h \ + Security/security_export.h \ + SecurityC.i \ + SSLIOPC.i \ SSLIOP/SSLIOP_Endpoint.i \ $(TAO_ROOT)/tao/IIOP_Profile.h \ $(TAO_ROOT)/tao/IIOP_Endpoint.h \ @@ -1720,6 +1732,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/DynamicC.i \ @@ -1741,7 +1756,7 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.h \ + SSLIOPC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -1808,11 +1823,11 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Security/security_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.i \ + SSLIOP/SSLIOP_Export.h \ + SecurityC.h \ + Security/security_export.h \ + SecurityC.i \ + SSLIOPC.i \ SSLIOP/SSLIOP_Endpoint.i \ $(TAO_ROOT)/tao/IIOP_Profile.h \ $(TAO_ROOT)/tao/IIOP_Endpoint.h \ @@ -2059,6 +2074,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/DynamicC.i \ @@ -2107,7 +2125,7 @@ realclean: clean $(TAO_ROOT)/tao/Connector_Registry.i \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/IIOP_Acceptor.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.h \ + SSLIOPC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -2153,11 +2171,11 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Security/security_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.i \ + SSLIOP/SSLIOP_Export.h \ + SecurityC.h \ + Security/security_export.h \ + SecurityC.i \ + SSLIOPC.i \ SSLIOP/SSLIOP_Connect.h \ $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ @@ -2438,6 +2456,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/DynamicC.i \ @@ -2579,7 +2600,7 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.h \ + SSLIOPC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -2607,6 +2628,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2761,11 +2785,11 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Security/security_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SecurityC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOPC.i \ + SSLIOP/SSLIOP_Export.h \ + SecurityC.h \ + Security/security_export.h \ + SecurityC.i \ + SSLIOPC.i \ SSLIOP/ssl_endpoints.i .obj/SSLIOPS.o .obj/SSLIOPS.so .shobj/SSLIOPS.o .shobj/SSLIOPS.so: SSLIOPS.cpp SSLIOPS.h \ @@ -2884,6 +2908,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -3207,6 +3234,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.Security b/TAO/orbsvcs/orbsvcs/Makefile.Security index bcb7be883d8..697697e8d37 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.Security +++ b/TAO/orbsvcs/orbsvcs/Makefile.Security @@ -179,6 +179,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -509,6 +512,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.Svc_Utils b/TAO/orbsvcs/orbsvcs/Makefile.Svc_Utils index 79c0df9d650..c407dbbbb27 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.Svc_Utils +++ b/TAO/orbsvcs/orbsvcs/Makefile.Svc_Utils @@ -77,9 +77,9 @@ realclean: clean .obj/Time_Utilities.o .obj/Time_Utilities.so .shobj/Time_Utilities.o .shobj/Time_Utilities.so: Time_Utilities.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + Time_Utilities.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -197,6 +197,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -351,13 +354,13 @@ realclean: clean $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i + svc_utils_export.h \ + TimeBaseC.i \ + Time_Utilities.i .obj/IOR_Multicast.o .obj/IOR_Multicast.so .shobj/IOR_Multicast.o .shobj/IOR_Multicast.so: IOR_Multicast.cpp IOR_Multicast.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + svc_utils_export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -475,6 +478,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -752,6 +758,9 @@ realclean: clean $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -1082,6 +1091,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1390,6 +1402,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1665,6 +1680,9 @@ realclean: clean $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.av b/TAO/orbsvcs/orbsvcs/Makefile.av index 50af2851236..a1c2296984f 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.av +++ b/TAO/orbsvcs/orbsvcs/Makefile.av @@ -298,6 +298,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -348,9 +351,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + AV/AV_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -433,54 +436,54 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + Property/property_export.h \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsC.h \ + AVStreamsC.i \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ + AV/AV_Core.h \ + AV/Transport.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/AV_Core.h AV/Transport.h AV/AVStreams_i.i AV/Flows_T.h \ AV/Flows_T.cpp AV/sfp.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ + sfpC.h \ + sfpC.i \ AV/Policy.h AV/Policy.i AV/MCast.h AV/FlowSpec_Entry.h \ AV/Protocol_Factory.h AV/MCast.i AV/UDP.h AV/UDP.i AV/RTCP.h \ AV/source.h AV/source.i AV/RTP.h .obj/FlowSpec_Entry.o .obj/FlowSpec_Entry.so .shobj/FlowSpec_Entry.o .shobj/FlowSpec_Entry.so: AV/FlowSpec_Entry.cpp AV/FlowSpec_Entry.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -577,6 +580,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -627,7 +633,7 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -758,10 +764,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ AV/AV_export.h $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i AV/Transport.h \ $(ACE_ROOT)/ace/Acceptor.h \ @@ -1000,6 +1006,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -1050,9 +1059,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + AV/AV_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -1135,43 +1144,43 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + Property/property_export.h \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsC.h \ + AVStreamsC.i \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ + AV/AV_Core.h \ + AV/Transport.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/AV_Core.h AV/Transport.h AV/AVStreams_i.i AV/Flows_T.cpp .obj/Endpoint_Strategy.o .obj/Endpoint_Strategy.so .shobj/Endpoint_Strategy.o .shobj/Endpoint_Strategy.so: AV/Endpoint_Strategy.cpp AV/Endpoint_Strategy.h \ @@ -1369,6 +1378,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -1419,9 +1431,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + AV/AV_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -1504,40 +1516,40 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + Property/property_export.h \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsC.h \ + AVStreamsC.i \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/Endpoint_Strategy.h \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ + AV/AV_Core.h \ + AV/Transport.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/AV_Core.h AV/Transport.h AV/AVStreams_i.i AV/Flows_T.h \ AV/Flows_T.cpp AV/Endpoint_Strategy_T.h AV/Endpoint_Strategy_T.cpp @@ -1737,6 +1749,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -1787,9 +1802,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + AV/AV_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -1872,40 +1887,40 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + Property/property_export.h \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsC.h \ + AVStreamsC.i \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/Endpoint_Strategy.h \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ + AV/AV_Core.h \ + AV/Transport.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/AV_Core.h AV/Transport.h AV/AVStreams_i.i AV/Flows_T.h \ AV/Flows_T.cpp AV/Endpoint_Strategy_T.cpp @@ -2031,6 +2046,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -2156,9 +2174,9 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Acceptor.cpp \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + AV/AV_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -2241,47 +2259,47 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + Property/property_export.h \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsC.h \ + AVStreamsC.i \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ + AV/AV_Core.h \ + AV/Transport.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/AV_Core.h AV/Transport.h AV/AVStreams_i.i AV/Flows_T.h \ AV/Flows_T.cpp AV/sfp.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ + sfpC.h \ + sfpC.i \ AV/Policy.h AV/Policy.i AV/MCast.h AV/FlowSpec_Entry.h \ AV/Protocol_Factory.h AV/MCast.i AV/UDP.h AV/UDP.i AV/Nil.h AV/RTP.h \ AV/RTCP.h AV/source.h AV/source.i AV/TCP.h @@ -2390,6 +2408,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -2441,9 +2462,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ AV/Policy.i AV/FlowSpec_Entry.h AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -2569,10 +2590,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ AV/AV_export.h AV/Transport.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ @@ -2622,36 +2643,36 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + CosPropertyServiceS.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ AV/AVStreams_i.i AV/Flows_T.h AV/Flows_T.cpp .obj/UDP.o .obj/UDP.so .shobj/UDP.o .shobj/UDP.so: AV/UDP.cpp AV/UDP.h \ @@ -2758,6 +2779,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -2809,9 +2833,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ AV/Policy.i AV/FlowSpec_Entry.h AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -2937,10 +2961,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ AV/AV_export.h AV/Transport.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ @@ -2990,36 +3014,36 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + CosPropertyServiceS.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ AV/AVStreams_i.i AV/Flows_T.h AV/Flows_T.cpp AV/MCast.h AV/MCast.i .obj/Policy.o .obj/Policy.so .shobj/Policy.o .shobj/Policy.so: AV/Policy.cpp AV/Policy.h \ @@ -3122,6 +3146,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -3173,9 +3200,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ AV/Policy.i AV/FlowSpec_Entry.h AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -3305,10 +3332,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ AV/AV_export.h AV/Transport.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ @@ -3455,6 +3482,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -3506,9 +3536,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ AV/Policy.i AV/FlowSpec_Entry.h AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -3634,10 +3664,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ AV/AV_export.h AV/Transport.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ @@ -3684,7 +3714,7 @@ AVSVC_COMPONENTS: .obj/MCast.o .obj/MCast.so .shobj/MCast.o .shobj/MCast.so: AV/MCast.cpp AV/MCast.h \ $(ACE_ROOT)/ace/pre.h AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3781,6 +3811,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -3831,7 +3864,7 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -3962,10 +3995,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ AV/AV_export.h $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i AV/Transport.h \ $(ACE_ROOT)/ace/Acceptor.h \ @@ -4017,36 +4050,36 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + CosPropertyServiceS.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ AV/AVStreams_i.i AV/Flows_T.h AV/Flows_T.cpp .obj/source.o .obj/source.so .shobj/source.o .shobj/source.so: AV/source.cpp $(ACE_ROOT)/ace/OS.h \ @@ -4146,6 +4179,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -4294,9 +4330,9 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Acceptor.cpp \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + AV/AV_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -4379,43 +4415,43 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + Property/property_export.h \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsC.h \ + AVStreamsC.i \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ + AV/AV_Core.h \ + AV/Transport.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/AV_Core.h AV/Transport.h AV/AVStreams_i.i AV/Flows_T.h \ AV/Flows_T.cpp AV/UDP.h AV/Protocol_Factory.h AV/Policy.h AV/Policy.i \ AV/FlowSpec_Entry.h AV/UDP.i AV/RTP.h AV/MCast.h AV/MCast.i @@ -4541,6 +4577,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -4689,9 +4728,9 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Acceptor.cpp \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + AV/AV_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -4774,43 +4813,43 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + Property/property_export.h \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsC.h \ + AVStreamsC.i \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ + AV/AV_Core.h \ + AV/Transport.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/AV_Core.h AV/Transport.h AV/AVStreams_i.i AV/Flows_T.h \ AV/Flows_T.cpp AV/UDP.h AV/Protocol_Factory.h AV/Policy.h AV/Policy.i \ AV/FlowSpec_Entry.h AV/UDP.i AV/RTP.h AV/MCast.h AV/MCast.i \ @@ -4920,6 +4959,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -4971,9 +5013,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ AV/Policy.i AV/FlowSpec_Entry.h AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -5099,10 +5141,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ AV/AV_export.h AV/Transport.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ @@ -5153,47 +5195,47 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + CosPropertyServiceS.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ AV/AVStreams_i.i AV/Flows_T.h AV/Flows_T.cpp AV/UDP.h AV/UDP.i \ AV/Nil.h .obj/sfp.o .obj/sfp.so .shobj/sfp.o .shobj/sfp.so: AV/sfp.cpp AV/sfp.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ + sfpC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -5307,6 +5349,9 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5461,7 +5506,7 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ + sfpC.i \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -5479,11 +5524,11 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ AV/Policy.i AV/MCast.h AV/FlowSpec_Entry.h AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + AVStreamsC.h \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ AV/AV_export.h AV/Transport.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ @@ -5525,36 +5570,36 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + CosPropertyServiceS.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ AV/AVStreams_i.i AV/Flows_T.h AV/Flows_T.cpp AV/UDP.h AV/UDP.i \ $(ACE_ROOT)/ace/ARGV.h \ $(ACE_ROOT)/ace/ARGV.i @@ -5678,6 +5723,9 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5990,6 +6038,9 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6299,6 +6350,9 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6607,6 +6661,9 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6883,6 +6940,9 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -7158,6 +7218,9 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ |