diff options
| author | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-26 02:21:17 +0000 |
|---|---|---|
| committer | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-26 02:21:17 +0000 |
| commit | 720664f6547959dea5a424ad4c1b2ab34a581267 (patch) | |
| tree | 138e8e1228e255ccb2aeff1232cb3bcaaed782ea /TAO/tao | |
| parent | fdf735e4b7b2e8666e51f0abb66106e00de72461 (diff) | |
| download | ATCD-720664f6547959dea5a424ad4c1b2ab34a581267.tar.gz | |
ChangeLogTag: Fri Jan 25 20:14:19 2002 Frank Hunleth <fhunleth@cs.wustl.edu>
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/PortableServer/Makefile | 1076 |
1 files changed, 693 insertions, 383 deletions
diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile index 14e186ae756..0f74db70839 100644 --- a/TAO/tao/PortableServer/Makefile +++ b/TAO/tao/PortableServer/Makefile @@ -50,7 +50,8 @@ CPP_SRCS += \ IORInfo \ ObjectReferenceFactory \ ObjectReferenceTemplate \ - AMH_Response_Handler + AMH_Response_Handler \ + PortableGroup_Hooks ifeq ($(minimum_corba),0) @@ -97,7 +98,8 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/PortableServer.o .obj/PortableServer.so .shobj/PortableServer.o .shobj/PortableServer.so: PortableServer.cpp PortableServer.h \ - $(ACE_ROOT)/ace/pre.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -193,7 +195,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i PortableServerC.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ @@ -231,8 +234,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ - Object_Adapter.h Key_Adapters.h \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i Object_Adapter.h Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -279,15 +282,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Servant_Base.h \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i poa_macros.h Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Atomic_Op.cpp Servant_Base.i \ - Active_Object_Map.h \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ + Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -295,11 +299,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Policy_Validator.h \ POA_Policy_Set.h POA_Policies.h POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \ - Object_Adapter.i + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i Object_Adapter.i .obj/PortableServerC.o .obj/PortableServerC.so .shobj/PortableServerC.o .shobj/PortableServerC.so: PortableServerC.cpp PortableServerC.h \ - $(ACE_ROOT)/ace/pre.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -433,8 +438,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i POA.h \ - Object_Adapter.h Key_Adapters.h \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i POA.h Object_Adapter.h Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -481,15 +486,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Servant_Base.h \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i poa_macros.h Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Atomic_Op.cpp Servant_Base.i \ - Active_Object_Map.h \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ + Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -497,8 +503,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Policy_Validator.h \ POA_Policy_Set.h POA_Policies.h POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \ - Object_Adapter.i POAManager.h \ + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i Object_Adapter.i POAManager.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ @@ -542,7 +548,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i POA.i \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + POA.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ @@ -582,7 +589,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB_Core.i .obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp \ - $(TAO_ROOT)/tao/PortableServer/POA.h \ + POA.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ @@ -675,10 +682,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + Object_Adapter.h \ + portableserver_export.h \ + Key_Adapters.h \ + PortableServerC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -722,7 +729,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -770,31 +777,31 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + Key_Adapters.i \ + poa_macros.h \ + Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Atomic_Op.cpp \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + Servant_Base.i \ + Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ + Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \ + Default_Policy_Validator.h \ $(TAO_ROOT)/tao/Policy_Validator.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \ + POA_Policy_Set.h \ + POA_Policies.h \ + POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ $(TAO_ROOT)/tao/Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ - $(TAO_ROOT)/tao/PortableServer/POAManager.h \ + POA_Policy_Set.i \ + Object_Adapter.i \ + POAManager.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ @@ -826,9 +833,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableServer/POAManager.i \ - $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \ + POAManager.i \ + POA_Cached_Policies.h \ + POA_Cached_Policies.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ $(ACE_ROOT)/ace/Containers.h \ @@ -841,22 +848,22 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/PortableServer/POA.i \ - $(TAO_ROOT)/tao/PortableServer/ImplRepoS.h \ - $(TAO_ROOT)/tao/PortableServer/ImplRepoC.h \ + POA.i \ + ImplRepoS.h \ + ImplRepoC.h \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/PortableServer/ImplRepoC.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ImplRepoS_T.h \ - $(TAO_ROOT)/tao/PortableServer/ImplRepoS_T.i \ - $(TAO_ROOT)/tao/PortableServer/ImplRepoS_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/ImplRepoS.i \ - $(TAO_ROOT)/tao/PortableServer/ImplRepo_i.h \ + ImplRepoC.i \ + PortableServer.h \ + Collocated_Object.h \ + Collocated_Object.i \ + ThruPOA_Object_Proxy_Impl.h \ + Direct_Object_Proxy_Impl.h \ + ImplRepoS_T.h \ + ImplRepoS_T.i \ + ImplRepoS_T.cpp \ + ImplRepoS.i \ + ImplRepo_i.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ @@ -865,10 +872,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/PortableServer/IORInfo.h \ - $(TAO_ROOT)/tao/PortableServer/ObjectReferenceTemplate.h \ - $(TAO_ROOT)/tao/PortableServer/ObjectReferenceFactory.h \ - $(TAO_ROOT)/tao/PortableServer/Default_Acceptor_Filter.h \ + IORInfo.h \ + ObjectReferenceTemplate.h \ + ObjectReferenceFactory.h \ + Default_Acceptor_Filter.h \ $(TAO_ROOT)/tao/Acceptor_Filter.h \ $(TAO_ROOT)/tao/Acceptor_Filter.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -921,7 +928,8 @@ CPPFLAGS += -I$(TAO_ROOT) Default_Acceptor_Filter.h PortableGroup_Hooks.h PortableServerC.h POA.h .obj/Default_Acceptor_Filter.o .obj/Default_Acceptor_Filter.so .shobj/Default_Acceptor_Filter.o .shobj/Default_Acceptor_Filter.so: Default_Acceptor_Filter.cpp \ - Default_Acceptor_Filter.h $(ACE_ROOT)/ace/pre.h \ + Default_Acceptor_Filter.h \ + $(ACE_ROOT)/ace/pre.h \ portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1059,7 +1067,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Pluggable.i .obj/Object_Adapter.o .obj/Object_Adapter.so .shobj/Object_Adapter.o .shobj/Object_Adapter.so: Object_Adapter.cpp Object_Adapter.h \ - $(ACE_ROOT)/ace/pre.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1067,8 +1076,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl Key_Adapters.h \ - PortableServerC.h $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + Key_Adapters.h PortableServerC.h \ + $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -1193,7 +1203,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -1240,15 +1251,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Servant_Base.h \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i poa_macros.h Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Atomic_Op.cpp Servant_Base.i \ - Active_Object_Map.h \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ + Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -1256,8 +1268,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Policy_Validator.h \ POA_Policy_Set.h POA_Policies.h POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \ - Object_Adapter.i POA.h POAManager.h \ + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i Object_Adapter.i POA.h POAManager.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ @@ -1301,8 +1313,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i POA.i \ - Strategized_Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + POA.i Strategized_Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -1374,7 +1386,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timeprobe.h .obj/Operation_Table.o .obj/Operation_Table.so .shobj/Operation_Table.o .shobj/Operation_Table.so: Operation_Table.cpp Operation_Table.h \ - $(ACE_ROOT)/ace/pre.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1556,8 +1569,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB.i .obj/Key_Adapters.o .obj/Key_Adapters.so .shobj/Key_Adapters.o .shobj/Key_Adapters.so: Key_Adapters.cpp Key_Adapters.h \ - $(ACE_ROOT)/ace/pre.h PortableServerC.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + PortableServerC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1691,7 +1704,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -1738,11 +1752,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i .obj/POAManager.o .obj/POAManager.so .shobj/POAManager.o .shobj/POAManager.so: POAManager.cpp POAManager.h \ - $(ACE_ROOT)/ace/pre.h PortableServerC.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + PortableServerC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1876,8 +1891,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ - poa_macros.h $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i poa_macros.h \ + $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ @@ -1957,22 +1973,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - Servant_Base.h \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Atomic_Op.cpp Servant_Base.i \ - Active_Object_Map.h \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ + Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ Default_Policy_Validator.h \ $(TAO_ROOT)/tao/Policy_Validator.h \ POA_Policy_Set.h POA_Policies.h POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \ - Object_Adapter.i POA_Cached_Policies.h POA_Cached_Policies.i \ + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i Object_Adapter.i POA_Cached_Policies.h \ + POA_Cached_Policies.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ $(ACE_ROOT)/ace/Containers.h \ @@ -1984,7 +2002,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i POA.i \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + POA.i \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -2024,8 +2043,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB_Core.i .obj/Active_Object_Map.o .obj/Active_Object_Map.so .shobj/Active_Object_Map.o .shobj/Active_Object_Map.so: Active_Object_Map.cpp Active_Object_Map.h \ - $(ACE_ROOT)/ace/pre.h Key_Adapters.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + Key_Adapters.h PortableServerC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2159,7 +2178,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -2206,18 +2226,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - Servant_Base.h \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Atomic_Op.cpp Servant_Base.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ + Servant_Base.i \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ Active_Object_Map.i .obj/Servant_Base.o .obj/Servant_Base.so .shobj/Servant_Base.o .shobj/Servant_Base.so: Servant_Base.cpp Servant_Base.h \ - $(ACE_ROOT)/ace/pre.h PortableServerC.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + PortableServerC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2351,12 +2372,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Atomic_Op.cpp Servant_Base.i \ - POA.h Object_Adapter.h Key_Adapters.h \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ + Servant_Base.i POA.h Object_Adapter.h Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -2403,10 +2425,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Active_Object_Map.h \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i poa_macros.h Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -2414,8 +2437,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Policy_Validator.h \ POA_Policy_Set.h POA_Policies.h POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \ - Object_Adapter.i POAManager.h \ + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i Object_Adapter.i POAManager.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ @@ -2459,8 +2482,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i POA.i \ - Operation_Table.h $(TAO_ROOT)/tao/Timeprobe.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + POA.i Operation_Table.h \ + $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ @@ -2617,8 +2641,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i Object_Adapter.h \ - portableserver_export.h Key_Adapters.h PortableServerC.h \ + $(ACE_ROOT)/ace/SString.i \ + Object_Adapter.h portableserver_export.h Key_Adapters.h \ + PortableServerC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2661,7 +2686,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -2708,15 +2734,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Servant_Base.h \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i poa_macros.h Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Atomic_Op.cpp Servant_Base.i \ - Active_Object_Map.h \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ + Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -2724,8 +2751,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Policy_Validator.h \ POA_Policy_Set.h POA_Policies.h POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \ - Object_Adapter.i POAManager.h \ + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i Object_Adapter.i POAManager.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ @@ -2769,8 +2796,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i POA.i \ - ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + POA.i ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -2920,8 +2947,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i Object_Adapter.h \ - Key_Adapters.h PortableServerC.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + Object_Adapter.h Key_Adapters.h PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ @@ -2958,7 +2985,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -3005,15 +3033,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Servant_Base.h \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i poa_macros.h Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Atomic_Op.cpp Servant_Base.i \ - Active_Object_Map.h \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ + Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -3021,8 +3050,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Policy_Validator.h \ POA_Policy_Set.h POA_Policies.h POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \ - Object_Adapter.i + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i Object_Adapter.i .obj/Strategized_Object_Proxy_Broker.o .obj/Strategized_Object_Proxy_Broker.so .shobj/Strategized_Object_Proxy_Broker.o .shobj/Strategized_Object_Proxy_Broker.so: Strategized_Object_Proxy_Broker.cpp \ Strategized_Object_Proxy_Broker.h portableserver_export.h \ @@ -3280,7 +3309,8 @@ CPPFLAGS += -I$(TAO_ROOT) Direct_Object_Proxy_Impl.h ThruPOA_Object_Proxy_Impl.h .obj/Collocated_Object.o .obj/Collocated_Object.so .shobj/Collocated_Object.o .shobj/Collocated_Object.so: Collocated_Object.cpp Collocated_Object.h \ - $(ACE_ROOT)/ace/pre.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3380,8 +3410,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i Servant_Base.h \ - PortableServerC.h $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.i \ + Servant_Base.h PortableServerC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/Encodable.h \ @@ -3414,12 +3445,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Atomic_Op.cpp Servant_Base.i \ - Collocated_Object.i Object_Adapter.h Key_Adapters.h \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ + Servant_Base.i Collocated_Object.i Object_Adapter.h Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -3466,10 +3498,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Active_Object_Map.h \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i poa_macros.h Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -3477,8 +3510,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Policy_Validator.h \ POA_Policy_Set.h POA_Policies.h POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \ - Object_Adapter.i $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i Object_Adapter.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ @@ -3699,27 +3733,27 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + PortableServer.h \ + portableserver_export.h \ + PortableServerC.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + PortableServerC.i \ + Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Atomic_Op.cpp \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + Servant_Base.i \ + Collocated_Object.h \ + Collocated_Object.i \ + ThruPOA_Object_Proxy_Impl.h \ + Direct_Object_Proxy_Impl.h \ PolicyS_T.h PolicyS_T.i PolicyS_T.cpp PolicyS.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + Object_Adapter.h \ + Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -3767,25 +3801,25 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + Key_Adapters.i \ + poa_macros.h \ + Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ + Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \ + Default_Policy_Validator.h \ $(TAO_ROOT)/tao/Policy_Validator.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \ + POA_Policy_Set.h \ + POA_Policies.h \ + POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ $(TAO_ROOT)/tao/Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ - $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + POA_Policy_Set.i \ + Object_Adapter.i \ + Operation_Table.h \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ @@ -3889,20 +3923,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/RequestInfo_Util.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + ServerRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \ - $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \ + ServerRequestInfo.inl \ + ServerInterceptorAdapter.h \ + ServerInterceptorAdapter.inl \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/ORB_Manager.o .obj/ORB_Manager.so .shobj/ORB_Manager.o .shobj/ORB_Manager.so: ORB_Manager.cpp ORB_Manager.h \ - $(ACE_ROOT)/ace/pre.h PortableServer.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + PortableServer.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3998,7 +4032,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i PortableServerC.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ @@ -4036,7 +4071,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ @@ -4057,9 +4093,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(TAO_ROOT)/tao/PortableServer/ImplRepo_i.h \ - $(TAO_ROOT)/tao/PortableServer/ImplRepoS.h \ - $(TAO_ROOT)/tao/PortableServer/ImplRepoC.h \ + ImplRepo_i.h \ + ImplRepoS.h \ + ImplRepoC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -4218,25 +4254,25 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/ImplRepoC.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + portableserver_export.h \ + ImplRepoC.i \ + PortableServer.h \ + PortableServerC.h \ + PortableServerC.i \ + Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Atomic_Op.cpp \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ImplRepoS_T.h \ - $(TAO_ROOT)/tao/PortableServer/ImplRepoS_T.i \ - $(TAO_ROOT)/tao/PortableServer/ImplRepoS_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/ImplRepoS.i \ + Servant_Base.i \ + Collocated_Object.h \ + Collocated_Object.i \ + ThruPOA_Object_Proxy_Impl.h \ + Direct_Object_Proxy_Impl.h \ + ImplRepoS_T.h \ + ImplRepoS_T.i \ + ImplRepoS_T.cpp \ + ImplRepoS.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ @@ -4480,28 +4516,30 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Servant_Base.h \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i poa_macros.h Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Atomic_Op.cpp Servant_Base.i \ - Active_Object_Map.h \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ + Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ Default_Policy_Validator.h \ $(TAO_ROOT)/tao/Policy_Validator.h \ POA_Policy_Set.h POA_Policies.h POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \ - Object_Adapter.i ServerRequestInfo.inl POA.h POAManager.h POAManager.i \ - POA_Cached_Policies.h POA_Cached_Policies.i \ + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i Object_Adapter.i ServerRequestInfo.inl POA.h \ + POAManager.h POAManager.i POA_Cached_Policies.h POA_Cached_Policies.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp POA.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + POA.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -4539,7 +4577,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB_Core.i .obj/ServerInterceptorAdapter.o .obj/ServerInterceptorAdapter.so .shobj/ServerInterceptorAdapter.o .shobj/ServerInterceptorAdapter.so: ServerInterceptorAdapter.cpp \ - ServerInterceptorAdapter.h $(ACE_ROOT)/ace/pre.h \ + ServerInterceptorAdapter.h \ + $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/post.h \ @@ -4777,26 +4816,28 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Servant_Base.h \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i poa_macros.h Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Atomic_Op.cpp Servant_Base.i \ - Active_Object_Map.h \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ + Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ Default_Policy_Validator.h \ $(TAO_ROOT)/tao/Policy_Validator.h \ POA_Policy_Set.h POA_Policies.h POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \ - Object_Adapter.i ServerRequestInfo.inl + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i Object_Adapter.i ServerRequestInfo.inl .obj/Default_Servant_Dispatcher.o .obj/Default_Servant_Dispatcher.so .shobj/Default_Servant_Dispatcher.o .shobj/Default_Servant_Dispatcher.so: Default_Servant_Dispatcher.cpp \ Default_Servant_Dispatcher.h \ - $(ACE_ROOT)/ace/pre.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4804,7 +4845,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl Servant_Dispatcher.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + Servant_Dispatcher.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -4887,8 +4929,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i Object_Adapter.h \ - Key_Adapters.h PortableServerC.h \ + $(ACE_ROOT)/ace/SString.i \ + Object_Adapter.h Key_Adapters.h PortableServerC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -4931,7 +4973,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -4978,15 +5021,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Servant_Base.h \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i poa_macros.h Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Atomic_Op.cpp Servant_Base.i \ - Active_Object_Map.h \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ + Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -4994,8 +5038,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Policy_Validator.h \ POA_Policy_Set.h POA_Policies.h POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \ - Object_Adapter.i POA.h POAManager.h \ + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i Object_Adapter.i POA.h POAManager.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ @@ -5039,7 +5083,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i POA.i + $(TAO_ROOT)/tao/OctetSeqC.i \ + POA.i .obj/Servant_Dispatcher.o .obj/Servant_Dispatcher.so .shobj/Servant_Dispatcher.o .shobj/Servant_Dispatcher.so: Servant_Dispatcher.cpp Servant_Dispatcher.h \ $(ACE_ROOT)/ace/pre.h \ @@ -5133,8 +5178,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i portableserver_export.h \ - Object_Adapter.h Key_Adapters.h PortableServerC.h \ + $(ACE_ROOT)/ace/SString.i \ + portableserver_export.h Object_Adapter.h Key_Adapters.h \ + PortableServerC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -5177,7 +5223,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -5224,15 +5271,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Servant_Base.h \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i poa_macros.h Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Atomic_Op.cpp Servant_Base.i \ - Active_Object_Map.h \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ + Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -5240,12 +5288,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Policy_Validator.h \ POA_Policy_Set.h POA_Policies.h POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \ - Object_Adapter.i + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i Object_Adapter.i .obj/POA_Cached_Policies.o .obj/POA_Cached_Policies.so .shobj/POA_Cached_Policies.o .shobj/POA_Cached_Policies.so: POA_Cached_Policies.cpp POA_Cached_Policies.h \ - $(ACE_ROOT)/ace/pre.h POA_Policies.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + POA_Policies.h PortableServerC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5379,16 +5427,18 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i POA_Policies.i \ - POA_Cached_Policies.i POA_Policy_Set.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + POA_Policies.i POA_Cached_Policies.i POA_Policy_Set.h \ $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i .obj/POA_Policies.o .obj/POA_Policies.so .shobj/POA_Policies.o .shobj/POA_Policies.so: POA_Policies.cpp POA_Policies.h \ - $(ACE_ROOT)/ace/pre.h PortableServerC.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + PortableServerC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5522,13 +5572,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i POA_Policies.i + $(TAO_ROOT)/tao/LocalObject.i \ + POA_Policies.i .obj/POA_Policy_Set.o .obj/POA_Policy_Set.so .shobj/POA_Policy_Set.o .shobj/POA_Policy_Set.so: POA_Policy_Set.cpp POA_Policy_Set.h \ - $(ACE_ROOT)/ace/pre.h POA_Policies.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + POA_Policies.h PortableServerC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5662,12 +5714,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i POA_Policies.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \ - POA_Cached_Policies.h POA_Cached_Policies.i \ + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i POA_Cached_Policies.h POA_Cached_Policies.i \ $(TAO_ROOT)/tao/Policy_Validator.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ @@ -5783,7 +5837,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB_Core.i .obj/Default_Policy_Validator.o .obj/Default_Policy_Validator.so .shobj/Default_Policy_Validator.o .shobj/Default_Policy_Validator.so: Default_Policy_Validator.cpp \ - Default_Policy_Validator.h $(ACE_ROOT)/ace/pre.h \ + Default_Policy_Validator.h \ + $(ACE_ROOT)/ace/pre.h \ portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -5881,8 +5936,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i POA_Policies.h \ - PortableServerC.h $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + POA_Policies.h PortableServerC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ @@ -5919,16 +5975,18 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i POA_Policies.i \ + $(TAO_ROOT)/tao/LocalObject.i \ + POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ $(TAO_ROOT)/tao/Policy_Set.i .obj/IORInfo.o .obj/IORInfo.so .shobj/IORInfo.o .shobj/IORInfo.so: IORInfo.cpp \ - $(TAO_ROOT)/tao/PortableServer/IORInfo.h \ + IORInfo.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5937,7 +5995,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ - $(TAO_ROOT)/tao/PortableServer/POA.h \ + POA.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -6021,9 +6079,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + Object_Adapter.h \ + Key_Adapters.h \ + PortableServerC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -6067,7 +6125,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -6115,31 +6173,31 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + Key_Adapters.i \ + poa_macros.h \ + Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Atomic_Op.cpp \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + Servant_Base.i \ + Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ + Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \ + Default_Policy_Validator.h \ $(TAO_ROOT)/tao/Policy_Validator.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \ + POA_Policy_Set.h \ + POA_Policies.h \ + POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ $(TAO_ROOT)/tao/Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ - $(TAO_ROOT)/tao/PortableServer/POAManager.h \ + POA_Policy_Set.i \ + Object_Adapter.i \ + POAManager.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ @@ -6171,9 +6229,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableServer/POAManager.i \ - $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \ + POAManager.i \ + POA_Cached_Policies.h \ + POA_Cached_Policies.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ $(ACE_ROOT)/ace/Containers.h \ @@ -6186,7 +6244,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/PortableServer/POA.i \ + POA.i \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ @@ -6236,7 +6294,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB_Core.i .obj/ObjectReferenceFactory.o .obj/ObjectReferenceFactory.so .shobj/ObjectReferenceFactory.o .shobj/ObjectReferenceFactory.so: ObjectReferenceFactory.cpp \ - $(TAO_ROOT)/tao/PortableServer/ObjectReferenceFactory.h \ + ObjectReferenceFactory.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -6374,18 +6432,18 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + PortableServerC.h \ + portableserver_export.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/POA.h \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + PortableServerC.i \ + POA.h \ + Object_Adapter.h \ + Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -6433,31 +6491,31 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + Key_Adapters.i \ + poa_macros.h \ + Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Atomic_Op.cpp \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + Servant_Base.i \ + Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ + Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \ + Default_Policy_Validator.h \ $(TAO_ROOT)/tao/Policy_Validator.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \ + POA_Policy_Set.h \ + POA_Policies.h \ + POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ $(TAO_ROOT)/tao/Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ - $(TAO_ROOT)/tao/PortableServer/POAManager.h \ + POA_Policy_Set.i \ + Object_Adapter.i \ + POAManager.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ @@ -6481,9 +6539,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableServer/POAManager.i \ - $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \ + POAManager.i \ + POA_Cached_Policies.h \ + POA_Cached_Policies.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ $(ACE_ROOT)/ace/Containers.h \ @@ -6496,10 +6554,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/PortableServer/POA.i + POA.i .obj/ObjectReferenceTemplate.o .obj/ObjectReferenceTemplate.so .shobj/ObjectReferenceTemplate.o .shobj/ObjectReferenceTemplate.so: ObjectReferenceTemplate.cpp \ - $(TAO_ROOT)/tao/PortableServer/ObjectReferenceTemplate.h \ + ObjectReferenceTemplate.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -6597,7 +6655,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + portableserver_export.h \ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -6638,17 +6696,17 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \ - $(TAO_ROOT)/tao/PortableServer/POA.h \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + POA.h \ + Object_Adapter.h \ + Key_Adapters.h \ + PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -6696,31 +6754,31 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + Key_Adapters.i \ + poa_macros.h \ + Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Atomic_Op.cpp \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + Servant_Base.i \ + Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ + Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \ + Default_Policy_Validator.h \ $(TAO_ROOT)/tao/Policy_Validator.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \ + POA_Policy_Set.h \ + POA_Policies.h \ + POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ $(TAO_ROOT)/tao/Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ - $(TAO_ROOT)/tao/PortableServer/POAManager.h \ + POA_Policy_Set.i \ + Object_Adapter.i \ + POAManager.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ @@ -6744,9 +6802,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/PortableServer/POAManager.i \ - $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \ + POAManager.i \ + POA_Cached_Policies.h \ + POA_Cached_Policies.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ $(ACE_ROOT)/ace/Containers.h \ @@ -6759,7 +6817,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/PortableServer/POA.i \ + POA.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -6932,6 +6990,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/Service_Context.inl \ + portableserver_export.h \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ @@ -7088,6 +7147,255 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Utils.h \ $(TAO_ROOT)/tao/GIOP_Utils.i +.obj/PortableGroup_Hooks.o .obj/PortableGroup_Hooks.so .shobj/PortableGroup_Hooks.o .shobj/PortableGroup_Hooks.so: PortableGroup_Hooks.cpp PortableGroup_Hooks.h \ + $(ACE_ROOT)/ace/pre.h \ + PortableServerC.h portableserver_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 \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Default_Constants.h \ + $(ACE_ROOT)/ace/Global_Macros.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.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 \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/String_Base.h \ + $(ACE_ROOT)/ace/String_Base_Const.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/String_Base.cpp \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + PortableServerC.i POA.h Object_Adapter.h Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + Key_Adapters.i poa_macros.h Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(ACE_ROOT)/ace/Atomic_Op.h \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ + Servant_Base.i Active_Object_Map.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + Default_Policy_Validator.h \ + $(TAO_ROOT)/tao/Policy_Validator.h \ + POA_Policy_Set.h POA_Policies.h POA_Policies.i \ + $(TAO_ROOT)/tao/Policy_Set.h \ + $(TAO_ROOT)/tao/Policy_Set.i \ + POA_Policy_Set.i Object_Adapter.i POAManager.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \ + $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + POAManager.i POA_Cached_Policies.h POA_Cached_Policies.i \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + POA.i + .obj/ImplRepoC.o .obj/ImplRepoC.so .shobj/ImplRepoC.o .shobj/ImplRepoC.so: ImplRepoC.cpp ImplRepoC.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -7384,7 +7692,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl .obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h \ - $(ACE_ROOT)/ace/pre.h ImplRepoC.h \ + $(ACE_ROOT)/ace/pre.h \ + ImplRepoC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -7555,23 +7864,23 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/ClientRequestInfo.inl \ portableserver_export.h ImplRepoC.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + PortableServer.h \ + portableserver_export.h \ + PortableServerC.h \ + PortableServerC.i \ + Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Atomic_Op.cpp \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + Servant_Base.i \ + Collocated_Object.h \ + Collocated_Object.i \ + ThruPOA_Object_Proxy_Impl.h \ + Direct_Object_Proxy_Impl.h \ ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp ImplRepoS.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + Object_Adapter.h \ + Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -7619,23 +7928,23 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + Key_Adapters.i \ + poa_macros.h \ + Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ + Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \ + Default_Policy_Validator.h \ $(TAO_ROOT)/tao/Policy_Validator.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \ + POA_Policy_Set.h \ + POA_Policies.h \ + POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ $(TAO_ROOT)/tao/Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ - $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + POA_Policy_Set.i \ + Object_Adapter.i \ + Operation_Table.h \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ @@ -7708,12 +8017,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/RequestInfo_Util.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + ServerRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \ - $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \ + ServerRequestInfo.inl \ + ServerInterceptorAdapter.h \ + ServerInterceptorAdapter.inl \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ @@ -7731,7 +8040,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/Basic_Types.i MessagingS.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + MessagingS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -7885,23 +8195,23 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + PortableServer.h \ + portableserver_export.h \ + PortableServerC.h \ + PortableServerC.i \ + Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Atomic_Op.cpp \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + Servant_Base.i \ + Collocated_Object.h \ + Collocated_Object.i \ + ThruPOA_Object_Proxy_Impl.h \ + Direct_Object_Proxy_Impl.h \ MessagingS_T.h MessagingS_T.i MessagingS_T.cpp MessagingS.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + Object_Adapter.h \ + Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -7949,25 +8259,25 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + Key_Adapters.i \ + poa_macros.h \ + Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ + Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \ + Default_Policy_Validator.h \ $(TAO_ROOT)/tao/Policy_Validator.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \ + POA_Policy_Set.h \ + POA_Policies.h \ + POA_Policies.i \ $(TAO_ROOT)/tao/Policy_Set.h \ $(TAO_ROOT)/tao/Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ - $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + POA_Policy_Set.i \ + Object_Adapter.i \ + Operation_Table.h \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ @@ -8046,12 +8356,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/RequestInfo_Util.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + ServerRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \ - $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \ + ServerRequestInfo.inl \ + ServerInterceptorAdapter.h \ + ServerInterceptorAdapter.inl \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ |