diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-12 14:54:30 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-12 14:54:30 +0000 |
| commit | c600d247096bfeefc6bf98e9de349c16d42ae7b3 (patch) | |
| tree | 8d4afea22101d64ee78209179a1261d1d44fcad1 | |
| parent | 1c9023bd7db3dc52534ef9b828967e0fc250aeae (diff) | |
| download | ATCD-c600d247096bfeefc6bf98e9de349c16d42ae7b3.tar.gz | |
ChangeLogTag:Mon Apr 12 09:52:58 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 46 | ||||
| -rw-r--r-- | TAO/examples/Event_Comm/Makefile | 2 | ||||
| -rw-r--r-- | TAO/examples/Quoter/Makefile | 4 | ||||
| -rw-r--r-- | TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile | 2 | ||||
| -rw-r--r-- | TAO/performance-tests/Pluggable/Makefile | 2 | ||||
| -rw-r--r-- | TAO/performance-tests/Thruput/TAO/Makefile | 507 | ||||
| -rw-r--r-- | TAO/tao/Makefile | 838 | ||||
| -rw-r--r-- | TAO/tao/MessagingC.cpp | 5 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 171 | ||||
| -rw-r--r-- | TAO/tao/ORB.h | 13 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.h | 42 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.i | 29 | ||||
| -rw-r--r-- | TAO/tao/Object.cpp | 55 | ||||
| -rw-r--r-- | TAO/tao/Object.h | 57 | ||||
| -rw-r--r-- | TAO/tao/Policy_Manager.cpp | 182 | ||||
| -rw-r--r-- | TAO/tao/Policy_Manager.h | 154 | ||||
| -rw-r--r-- | TAO/tao/Policy_Manager.i | 38 | ||||
| -rw-r--r-- | TAO/tao/Stub.cpp | 135 | ||||
| -rw-r--r-- | TAO/tao/Stub.h | 36 | ||||
| -rw-r--r-- | TAO/tao/orbconf.h | 26 | ||||
| -rw-r--r-- | TAO/tests/Param_Test/Makefile | 2 |
22 files changed, 1826 insertions, 524 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 5b748631533..b91a504fc4d 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,49 @@ +Mon Apr 12 09:52:58 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/Makefile: + Keep working on the CORBA Messaging framework. + + * tao/orbconf.h: + * tao/ORB.h: + * tao/ORB.cpp: + Added support for "PolicyCurrent" and "ORBPolicyManager" into + resolve_initial_references() + + * tao/ORB_Core.h: + * tao/ORB_Core.i: + * tao/ORB_Core.cpp: + Added methods to set and query the TSS PolicyCurrent and the + per-ORB PolicyManager. + + * tao/Object.h: + * tao/Object.cpp: + Implemented the standard methods to access and query policies, + but they just delegate on the TAO_Stub methods. + + * tao/Stub.h: + * tao/Stub.cpp: + Added methods to set and query the policies. + + * tao/Policy_Manager.h: + * tao/Policy_Manager.i: + * tao/Policy_Manager.cpp: + Simple implementation of the CORBA::PolicyManager and + CORBA::PolicyCurrent interfaces. There is a helper class shared + between both implementations that is also used by the + corresponding methods in CORBA::Object (and TAO_Stub). + + * tao/MessagingC.cpp: + Added missing template instantiation + + * tests/Param_Test/Makefile: + * examples/Event_Comm/Makefile: + * examples/Quoter/Makefile: + * performance-tests/Cubit/TAO/IDL_Cubit/Makefile: + * performance-tests/Pluggable/Makefile: + * performance-tests/Thruput/TAO/Makefile: + Removed extra rules to compile .idl files, they were giving me + headaches when running parallel compiles. + Mon Apr 12 03:30:18 1999 Pradeep Gore <pradeep@flamenco.cs.wustl.edu> * TAO_IDL/be/be_visitor_union/any_op_cs.cpp (gen_extraction): diff --git a/TAO/examples/Event_Comm/Makefile b/TAO/examples/Event_Comm/Makefile index a44f8e329f5..95d7842ab25 100644 --- a/TAO/examples/Event_Comm/Makefile +++ b/TAO/examples/Event_Comm/Makefile @@ -85,8 +85,6 @@ LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs CPPFLAGS += -I$(TAO_ROOT)/orbsvcs .PRECIOUS: Event_CommC.cpp Event_CommS.cpp Event_CommC.h Event_CommS.h -#$(IDL_SRC): event.idl -# $(TAO_ROOT)/TAO_IDL/tao_idl cubit.idl supplier: $(addprefix $(VDIR),$(SUPPLIER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) diff --git a/TAO/examples/Quoter/Makefile b/TAO/examples/Quoter/Makefile index 30d218e81a7..331a7f83ad8 100644 --- a/TAO/examples/Quoter/Makefile +++ b/TAO/examples/Quoter/Makefile @@ -84,13 +84,11 @@ TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs \ -I$(TAO_ROOT) $(TSS_ORB_FLAG) +TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs realclean: clean -/bin/rm -rf *C.* *S.* *S_T.* -$(IDL_SRC): Quoter.idl - $(TAO_ROOT)/TAO_IDL/tao_idl Quoter.idl -I$(TAO_ROOT)/orbsvcs/orbsvcs - .PRECIOUS: $(IDL_SRC) client: $(addprefix $(VDIR),$(CLIENT_OBJS)) diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile index 16945914a1e..7737b996e39 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile @@ -76,8 +76,6 @@ include $(TAO_ROOT)/taoconfig.mk LDFLAGS += -L$(TAO_ROOT)/tao .PRECIOUS: cubitC.cpp cubitS.cpp cubitC.h cubitS.h -#$(IDL_SRC): cubit.idl -# $(TAO_ROOT)/TAO_IDL/tao_idl cubit.idl server: $(addprefix $(VDIR),$(CUBIT_SVR_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) diff --git a/TAO/performance-tests/Pluggable/Makefile b/TAO/performance-tests/Pluggable/Makefile index 3ae47a9df80..bf98d811277 100644 --- a/TAO/performance-tests/Pluggable/Makefile +++ b/TAO/performance-tests/Pluggable/Makefile @@ -58,8 +58,6 @@ include $(TAO_ROOT)/taoconfig.mk LDFLAGS += -L$(TAO_ROOT)/tao .PRECIOUS: PP_TestC.cpp PP_TestS.cpp PP_TestC.h PP_TestS.h -#$(IDL_SRC): PP_Test.idl -# $(TAO_ROOT)/TAO_IDL/tao_idl PP_Test.idl server: $(addprefix $(VDIR),$(PP_TEST_SVR_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) diff --git a/TAO/performance-tests/Thruput/TAO/Makefile b/TAO/performance-tests/Thruput/TAO/Makefile index 7c068c3bc0e..07609b50261 100644 --- a/TAO/performance-tests/Thruput/TAO/Makefile +++ b/TAO/performance-tests/Thruput/TAO/Makefile @@ -51,9 +51,6 @@ include $(TAO_ROOT)/taoconfig.mk LDFLAGS += -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT) -$(IDL_SRC): ttcp.idl - $(TAO_ROOT)/TAO_IDL/tao_idl ttcp.idl - server: $(addprefix $(VDIR),$(TTCP_SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) @@ -137,6 +134,33 @@ realclean: clean $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/IOR_LookupTable.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.i \ + $(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/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/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/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ @@ -177,36 +201,10 @@ realclean: clean $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POA.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.i \ - $(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/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/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/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ @@ -217,6 +215,7 @@ realclean: clean $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map.i \ $(ACE_ROOT)/ace/Map_T.h \ @@ -235,6 +234,7 @@ realclean: clean $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/Key_Adapters.i \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -299,12 +299,8 @@ realclean: clean $(TAO_ROOT)/tao/POAManager.h \ $(TAO_ROOT)/tao/poa_macros.h \ $(TAO_ROOT)/tao/POAManager.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ @@ -312,10 +308,17 @@ realclean: clean $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Invocation.h \ @@ -396,6 +399,33 @@ realclean: clean $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/IOR_LookupTable.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.i \ + $(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/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/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/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ @@ -436,36 +466,10 @@ realclean: clean $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POA.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.i \ - $(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/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/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/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ @@ -476,6 +480,7 @@ realclean: clean $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map.i \ $(ACE_ROOT)/ace/Map_T.h \ @@ -494,6 +499,7 @@ realclean: clean $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/Key_Adapters.i \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -558,12 +564,8 @@ realclean: clean $(TAO_ROOT)/tao/POAManager.h \ $(TAO_ROOT)/tao/poa_macros.h \ $(TAO_ROOT)/tao/POAManager.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ @@ -571,10 +573,17 @@ realclean: clean $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Invocation.h \ @@ -660,6 +669,33 @@ realclean: clean $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/IOR_LookupTable.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.i \ + $(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/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/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/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ @@ -700,36 +736,10 @@ realclean: clean $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POA.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.i \ - $(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/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/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/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ @@ -740,6 +750,7 @@ realclean: clean $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map.i \ $(ACE_ROOT)/ace/Map_T.h \ @@ -758,6 +769,7 @@ realclean: clean $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/Key_Adapters.i \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -822,12 +834,8 @@ realclean: clean $(TAO_ROOT)/tao/POAManager.h \ $(TAO_ROOT)/tao/poa_macros.h \ $(TAO_ROOT)/tao/POAManager.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ @@ -835,10 +843,17 @@ realclean: clean $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Invocation.h \ @@ -924,6 +939,33 @@ realclean: clean $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/IOR_LookupTable.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.i \ + $(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/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/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/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ @@ -964,36 +1006,10 @@ realclean: clean $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POA.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.i \ - $(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/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/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/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ @@ -1004,6 +1020,7 @@ realclean: clean $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map.i \ $(ACE_ROOT)/ace/Map_T.h \ @@ -1022,6 +1039,7 @@ realclean: clean $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/Key_Adapters.i \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -1086,12 +1104,8 @@ realclean: clean $(TAO_ROOT)/tao/POAManager.h \ $(TAO_ROOT)/tao/poa_macros.h \ $(TAO_ROOT)/tao/POAManager.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ @@ -1099,10 +1113,17 @@ realclean: clean $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Invocation.h \ @@ -1190,6 +1211,33 @@ realclean: clean $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/IOR_LookupTable.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.i \ + $(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/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/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/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ @@ -1230,36 +1278,10 @@ realclean: clean $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POA.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.i \ - $(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/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/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/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ @@ -1270,6 +1292,7 @@ realclean: clean $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map.i \ $(ACE_ROOT)/ace/Map_T.h \ @@ -1288,6 +1311,7 @@ realclean: clean $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/Key_Adapters.i \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -1352,12 +1376,8 @@ realclean: clean $(TAO_ROOT)/tao/POAManager.h \ $(TAO_ROOT)/tao/poa_macros.h \ $(TAO_ROOT)/tao/POAManager.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ @@ -1365,10 +1385,17 @@ realclean: clean $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Invocation.h \ @@ -1449,6 +1476,33 @@ realclean: clean $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/IOR_LookupTable.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.i \ + $(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/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/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/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ @@ -1489,36 +1543,10 @@ realclean: clean $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POA.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.i \ - $(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/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/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/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ @@ -1529,6 +1557,7 @@ realclean: clean $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map.i \ $(ACE_ROOT)/ace/Map_T.h \ @@ -1547,6 +1576,7 @@ realclean: clean $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/Key_Adapters.i \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -1611,12 +1641,8 @@ realclean: clean $(TAO_ROOT)/tao/POAManager.h \ $(TAO_ROOT)/tao/poa_macros.h \ $(TAO_ROOT)/tao/POAManager.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ @@ -1624,10 +1650,17 @@ realclean: clean $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Invocation.h \ @@ -1712,6 +1745,33 @@ realclean: clean $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/IOR_LookupTable.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.i \ + $(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/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/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/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ @@ -1752,36 +1812,10 @@ realclean: clean $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POA.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.i \ - $(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/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/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/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ @@ -1792,6 +1826,7 @@ realclean: clean $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map.i \ $(ACE_ROOT)/ace/Map_T.h \ @@ -1810,6 +1845,7 @@ realclean: clean $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/Key_Adapters.i \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -1874,12 +1910,8 @@ realclean: clean $(TAO_ROOT)/tao/POAManager.h \ $(TAO_ROOT)/tao/poa_macros.h \ $(TAO_ROOT)/tao/POAManager.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/MProfile.i \ - $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ @@ -1887,10 +1919,17 @@ realclean: clean $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Invocation.h \ diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index e93871ac623..c08e7aa50bc 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -126,6 +126,20 @@ DYNAMIC_ANY_FILES += \ endif # minimum_corba +ifndef corba_messaging + corba_messaging = 1 +endif # corba_messaging + +ifeq ($(corba_messaging),1) +ORB_CORE_FILES += \ + MessagingC \ + MessagingS \ + Policy_Manager + +CPPFLAGS += -DTAO_HAS_CORBA_MESSAGING + +endif # corba_messaging + ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif @@ -238,7 +252,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -433,13 +446,20 @@ realclean: $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/IIOP_Connector.h \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/IIOP_Acceptor.h \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -453,15 +473,8 @@ realclean: $(TAO_ROOT)/tao/poa_macros.h \ $(TAO_ROOT)/tao/POAManager.i \ $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/IIOP_Connector.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -471,7 +484,9 @@ realclean: $(TAO_ROOT)/tao/Server_Request.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + $(TAO_ROOT)/tao/Timeprobe.h \ + $(ACE_ROOT)/ace/Timeprobe.h .obj/Key_Adapters.o .obj/Key_Adapters.so .shobj/Key_Adapters.o .shobj/Key_Adapters.so: Key_Adapters.cpp \ $(TAO_ROOT)/tao/Key_Adapters.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -480,7 +495,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -616,7 +630,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -738,8 +751,6 @@ realclean: $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -837,7 +848,6 @@ realclean: $(TAO_ROOT)/tao/POAManager.i \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ - $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ @@ -847,12 +857,13 @@ realclean: $(ACE_ROOT)/ace/SOCK_Connector.i \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Forwarding_Servant.h \ - $(TAO_ROOT)/tao/Timeprobe.h \ - $(ACE_ROOT)/ace/Timeprobe.h + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Forwarding_Servant.h .obj/POAC.o .obj/POAC.so .shobj/POAC.o .shobj/POAC.so: POAC.cpp \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -864,7 +875,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -976,8 +986,6 @@ realclean: $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -1076,8 +1084,6 @@ realclean: $(TAO_ROOT)/tao/POAManager.i \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ @@ -1087,9 +1093,13 @@ realclean: $(ACE_ROOT)/ace/SOCK_Connector.i \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Invocation.i \ @@ -1109,7 +1119,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -1220,8 +1229,6 @@ realclean: $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -1335,6 +1342,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp @@ -1346,7 +1355,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -1509,6 +1517,7 @@ realclean: $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ @@ -1529,13 +1538,10 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -1571,6 +1577,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp @@ -1583,7 +1591,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -1791,7 +1798,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -1982,8 +1988,6 @@ realclean: $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -2019,6 +2023,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -2035,7 +2041,6 @@ realclean: $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -2168,7 +2173,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -2282,7 +2286,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -2467,6 +2470,7 @@ realclean: $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ @@ -2475,13 +2479,10 @@ realclean: $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -2515,6 +2516,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -2528,7 +2531,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -2701,7 +2703,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -2880,6 +2881,7 @@ realclean: $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ @@ -2890,13 +2892,10 @@ realclean: $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -2930,6 +2929,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp @@ -2942,7 +2943,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -3112,7 +3112,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -3278,6 +3277,7 @@ realclean: $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ @@ -3298,13 +3298,10 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -3340,6 +3337,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp @@ -3351,7 +3350,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -3521,6 +3519,7 @@ realclean: $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ @@ -3541,13 +3540,10 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -3580,6 +3576,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -3592,7 +3590,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -3710,7 +3707,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -3903,19 +3899,17 @@ realclean: $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/POAS.i \ @@ -3949,6 +3943,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp @@ -3960,7 +3956,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -4085,7 +4080,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -4210,7 +4204,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -4330,7 +4323,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -4440,7 +4432,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -4558,7 +4549,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -4658,7 +4648,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -4723,7 +4712,6 @@ realclean: $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -4831,7 +4819,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -4941,7 +4928,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -5061,8 +5047,6 @@ realclean: $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/DynAnyC.i .obj/CurrentS.o .obj/CurrentS.so .shobj/CurrentS.o .shobj/CurrentS.so: CurrentS.cpp \ @@ -5074,7 +5058,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -5185,8 +5168,6 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ @@ -5211,7 +5192,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -5280,7 +5260,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -5357,7 +5336,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -5520,6 +5498,7 @@ realclean: $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ @@ -5540,13 +5519,10 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -5582,6 +5558,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp @@ -5593,7 +5571,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -5654,14 +5631,17 @@ realclean: $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -5691,22 +5671,19 @@ realclean: $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAC.h \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.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/PolicyC.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/POAC.i \ @@ -5800,8 +5777,6 @@ realclean: $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/POAS.i \ @@ -5833,6 +5808,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -5849,7 +5826,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -5996,8 +5972,6 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ @@ -6092,6 +6066,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/CDR_Interpreter.h \ $(TAO_ROOT)/tao/TAO_Internal.h \ @@ -6111,7 +6087,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -6228,8 +6203,6 @@ realclean: $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -6339,6 +6312,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -6355,7 +6330,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -6471,8 +6445,6 @@ realclean: $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ @@ -6492,7 +6464,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -6559,8 +6530,9 @@ realclean: $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Any.i TimeBaseC.i \ - TimeBaseS.h TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i + $(TAO_ROOT)/tao/Any.i \ + TimeBaseC.i TimeBaseS.h TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp \ + TimeBaseS.i .obj/TimeBaseS.o .obj/TimeBaseS.so .shobj/TimeBaseS.o .shobj/TimeBaseS.so: TimeBaseS.cpp TimeBaseS.h TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ @@ -6570,7 +6542,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -6637,8 +6608,8 @@ realclean: $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Any.i TimeBaseC.i \ - TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i + $(TAO_ROOT)/tao/Any.i \ + TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i .obj/Principal.o .obj/Principal.so .shobj/Principal.o .shobj/Principal.so: Principal.cpp \ $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -6647,7 +6618,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -6755,7 +6725,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -6857,7 +6826,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -7057,8 +7025,6 @@ realclean: $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/POAS.i \ @@ -7090,6 +7056,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -7103,7 +7071,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -7178,7 +7145,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -7365,19 +7331,17 @@ realclean: $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/POAS.i \ @@ -7411,11 +7375,16 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h .obj/Typecode.o .obj/Typecode.so .shobj/Typecode.o .shobj/Typecode.so: Typecode.cpp \ @@ -7424,7 +7393,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -7537,7 +7505,6 @@ realclean: $(ACE_ROOT)/ace/Timeprobe.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -7707,6 +7674,7 @@ realclean: $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ @@ -7725,13 +7693,10 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -7767,6 +7732,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -7780,7 +7747,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -7934,7 +7900,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -8120,6 +8085,7 @@ realclean: $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ @@ -8128,13 +8094,10 @@ realclean: $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -8168,6 +8131,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp @@ -8179,7 +8144,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -8247,7 +8211,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -8353,7 +8316,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -8533,6 +8495,7 @@ realclean: $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ @@ -8541,13 +8504,10 @@ realclean: $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -8583,6 +8543,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp @@ -8595,7 +8557,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -8760,6 +8721,7 @@ realclean: $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ @@ -8778,13 +8740,10 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -8820,6 +8779,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -8842,7 +8803,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -9005,6 +8965,7 @@ realclean: $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ @@ -9025,13 +8986,10 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -9067,6 +9025,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -9104,7 +9064,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -9205,7 +9164,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -9362,7 +9320,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -9533,6 +9490,7 @@ realclean: $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ @@ -9553,13 +9511,10 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ @@ -9592,6 +9547,8 @@ realclean: $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ @@ -9605,7 +9562,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -9717,16 +9673,13 @@ realclean: $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i + $(TAO_ROOT)/tao/PolicyC.i .obj/IOR_LookupTable.o .obj/IOR_LookupTable.so .shobj/IOR_LookupTable.o .shobj/IOR_LookupTable.so: IOR_LookupTable.cpp IOR_LookupTable.h \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -9821,7 +9774,6 @@ realclean: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -9938,7 +9890,6 @@ realclean: $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -10055,7 +10006,6 @@ realclean: $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -10158,12 +10108,546 @@ realclean: $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/ORB.i +.obj/MessagingC.o .obj/MessagingC.so .shobj/MessagingC.o .shobj/MessagingC.so: MessagingC.cpp \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/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/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(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/Signal.h \ + $(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 \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(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_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/IOR_LookupTable.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.i \ + $(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/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/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/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/ORB.i \ + $(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/PolicyC.i \ + $(TAO_ROOT)/tao/iopfwd.h \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/MessagingS.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)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(TAO_ROOT)/tao/IIOP_Connector.h \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(TAO_ROOT)/tao/Connect.h \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/Connect.i \ + $(TAO_ROOT)/tao/IIOP_Acceptor.h \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map.i \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair.i \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_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 \ + $(TAO_ROOT)/tao/Key_Adapters.i \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Active_Object_Map.i \ + $(TAO_ROOT)/tao/POAManager.h \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/POAManager.i \ + $(TAO_ROOT)/tao/Object_Adapter.h \ + $(TAO_ROOT)/tao/Object_Adapter.i \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.i +.obj/MessagingS.o .obj/MessagingS.so .shobj/MessagingS.o .shobj/MessagingS.so: MessagingS.cpp \ + $(TAO_ROOT)/tao/MessagingS.h \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/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/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(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/Signal.h \ + $(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 \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(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_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(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)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/IOR_LookupTable.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.i \ + $(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/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/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/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/ORB.i \ + $(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/PolicyC.i \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/iopfwd.h \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/MessagingS_T.h \ + $(TAO_ROOT)/tao/MessagingS_T.i \ + $(TAO_ROOT)/tao/MessagingS_T.cpp \ + $(TAO_ROOT)/tao/MessagingS.i \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Server_Request.i +.obj/Policy_Manager.o .obj/Policy_Manager.so .shobj/Policy_Manager.o .shobj/Policy_Manager.so: Policy_Manager.cpp \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/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/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(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/Signal.h \ + $(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 \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(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_Stream.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/IOR_LookupTable.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.i \ + $(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/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/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/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/ORB.i \ + $(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/PolicyC.i \ + $(TAO_ROOT)/tao/DynAnyC.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/DynAnyC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.i \ + $(TAO_ROOT)/tao/Policy_Manager.i .obj/DynAnyC.o .obj/DynAnyC.so .shobj/DynAnyC.o .shobj/DynAnyC.so: DynAnyC.cpp \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -10291,15 +10775,12 @@ realclean: $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i + $(TAO_ROOT)/tao/POA_CORBA.h .obj/DynAnyS.o .obj/DynAnyS.so .shobj/DynAnyS.o .shobj/DynAnyS.so: DynAnyS.cpp \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -10416,8 +10897,6 @@ realclean: $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ @@ -10427,7 +10906,6 @@ realclean: $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -10539,8 +11017,6 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ @@ -10564,7 +11040,6 @@ realclean: $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -10676,8 +11151,6 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ @@ -10695,7 +11168,6 @@ realclean: $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -10807,8 +11279,6 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ @@ -10826,7 +11296,6 @@ realclean: $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -10938,8 +11407,6 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ @@ -10957,7 +11424,6 @@ realclean: $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -11069,8 +11535,6 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ @@ -11088,7 +11552,6 @@ realclean: $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -11200,8 +11663,6 @@ realclean: $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/DynAnyC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ @@ -11221,7 +11682,6 @@ realclean: $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp index c945bdf4548..9b622e4b003 100644 --- a/TAO/tao/MessagingC.cpp +++ b/TAO/tao/MessagingC.cpp @@ -2231,6 +2231,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::Poller_ptr &_ #endif /* TAO_POLLER */ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class TAO_Unbounded_Sequence<Messaging::PolicyValue>; + #if defined(TAO_POLLER) template class TAO_Object_Field_T<Messaging::ReplyHandler>; template class TAO_Object_Field_T<Messaging::Poller>; @@ -2238,6 +2241,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::Poller_ptr &_ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate TAO_Unbounded_Sequence<Messaging::PolicyValue> + #if defined(TAO_POLLER) # pragma instantiate TAO_Object_Field_T<Messaging::ReplyHandler> # pragma instantiate TAO_Object_Field_T<Messaging::Poller> diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index ea7f3dce981..98f0ae7d448 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -461,6 +461,8 @@ CORBA_ORB::resolve_root_poa (const char *adapter_name, TAO_POA_Manager *poa_manager, const TAO_POA_Policies *policies) { + // @@ Irfan: this method should take a CORBA::Environment as + // argument! CORBA::Environment env; return this->orb_core_->root_poa_reference (env, @@ -472,6 +474,8 @@ CORBA_ORB::resolve_root_poa (const char *adapter_name, CORBA_Object_ptr CORBA_ORB::resolve_poa_current (void) { + // @@ Irfan: this method should take a CORBA::Environment as + // argument! // Return the pointer to this thread's POACurrent. CORBA::Environment env; @@ -488,8 +492,32 @@ CORBA_ORB::resolve_poa_current (void) } CORBA_Object_ptr +CORBA_ORB::resolve_policy_manager (CORBA::Environment& ACE_TRY_ENV) +{ + TAO_Policy_Manager *policy_manager = + this->orb_core_->policy_manager (); + if (policy_manager == 0) + return CORBA_Object::_nil (); + + return policy_manager->_this (ACE_TRY_ENV); +} + +CORBA_Object_ptr +CORBA_ORB::resolve_policy_current (CORBA::Environment& ACE_TRY_ENV) +{ + TAO_Policy_Current *policy_current = + this->orb_core_->policy_current (); + if (policy_current == 0) + return CORBA_Object::_nil (); + + return policy_current->_this (ACE_TRY_ENV); +} + +CORBA_Object_ptr CORBA_ORB::resolve_commandline_ref (const char *& init_ref) { + // @@ Vishal: this method should take a CORBA::Environment as + // argument! // @@ Where are the exceptions caught ?? CORBA::Environment env; @@ -524,8 +552,10 @@ CORBA_ORB::resolve_commandline_ref (const char *& init_ref) CORBA_Object_ptr CORBA_ORB::resolve_service (CORBA::String service_name, - ACE_Time_Value *timeout) + ACE_Time_Value *timeout) { + // @@ Vishal: this method should take a CORBA::Environment as + // argument! CORBA::Environment env; CORBA_Object_ptr return_value = CORBA_Object::_nil (); @@ -588,6 +618,8 @@ CORBA_ORB::resolve_service (CORBA::String service_name, CORBA_Object_ptr CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout) { + // @@ Vishal: this method should take a CORBA::Environment as + // argument! CORBA::Environment env; CORBA_Object_ptr return_value = CORBA_Object::_nil (); @@ -648,7 +680,7 @@ CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout) int CORBA_ORB::multicast_query (char *buf, - const char *service_name, + const char *service_name, u_short port, ACE_Time_Value *timeout) { @@ -660,40 +692,39 @@ CORBA_ORB::multicast_query (char *buf, if (acceptor.open (ACE_Addr::sap_any) == -1 || acceptor.get_local_addr (my_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "acceptor.open () || " - "acceptor.get_local_addr () failed"), - -1); + "acceptor.open () || " + "acceptor.get_local_addr () failed"), + -1); // Send a Multicast with service name and a port no. ACE_SOCK_Dgram dgram; // This starts out initialized to all zeros! ACE_INET_Addr multicast_addr (port, - ACE_DEFAULT_MULTICAST_ADDR); + ACE_DEFAULT_MULTICAST_ADDR); // Open the datagram. if (dgram.open (ACE_Addr::sap_any) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "unable to open the datagram"), - -1); + "Unable to open the Datagram!\n"), + -1); // Convert the port that we are listening at to Network Byte Order. ACE_UINT16 response_port = ACE_HTONS (my_addr.get_port_number ()); // Length of data to be sent. This is sent as a header. - CORBA::Short data_len = + CORBA::Short data_len = ACE_HTONS (sizeof (ACE_UINT16) + ACE_OS::strlen (service_name)); - + // Vector to be sent. const int iovcnt = 3; iovec iovp[iovcnt]; - + // The length of data to be sent. iovp[0].iov_base = (char *) &data_len; iovp[0].iov_len = sizeof (CORBA::Short); - + // The port at which we are listening. iovp[1].iov_base = (char *) &response_port; iovp[1].iov_len = sizeof (ACE_UINT16); @@ -749,7 +780,7 @@ CORBA_ORB::multicast_query (char *buf, timeout); // Close socket now. stream.close (); - + // Check for errors. if (result == -1) ACE_ERROR ((LM_ERROR, @@ -759,7 +790,7 @@ CORBA_ORB::multicast_query (char *buf, { // Null terminate message. buf[result] = 0; - + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s: service resolved to IOR <%s>\n", @@ -789,6 +820,8 @@ CORBA_ORB::multicast_to_service (const char * service_name, u_short port, ACE_Time_Value *timeout) { + // @@ Vishal: this method should take a CORBA::Environment as + // argument! char buf[BUFSIZ + 1]; // Use UDP multicast to locate the service. @@ -796,15 +829,15 @@ CORBA_ORB::multicast_to_service (const char * service_name, CORBA_Object::_nil (); if (this->multicast_query (buf, - service_name, - port, - timeout) == 0) + service_name, + port, + timeout) == 0) { CORBA::Environment env; // Convert IOR to an object reference. CORBA_Object_ptr objectified_ior = - this->string_to_object ((CORBA::String) buf, + this->string_to_object ((CORBA::String) buf, env); // Check for errors. @@ -828,7 +861,7 @@ CORBA_ORB::resolve_initial_references (CORBA::String name, CORBA_Object_ptr CORBA_ORB::resolve_initial_references (CORBA::String name, ACE_Time_Value *timeout, - CORBA_Environment &TAO_IN_ENV) + CORBA_Environment &ACE_TRY_ENV) { // Get the table of initial references specified through // -ORBInitRef. @@ -840,47 +873,47 @@ CORBA_ORB::resolve_initial_references (CORBA::String name, // Is the service name in the IOR Table. if (table->find_ior (object_id, ior) == 0) - return this->string_to_object (ior.c_str (), TAO_IN_ENV); + return this->string_to_object (ior.c_str (), ACE_TRY_ENV); else { // Get the list of initial reference prefixes specified through // -ORBDefaultInitRef. - char *default_init_ref = - this->orb_core_->orb_params ()->default_init_ref (); + char * default_init_ref = + this->orb_core_->orb_params ()->default_init_ref (); // Check if a DefaultInitRef was specified. if (ACE_OS::strlen (default_init_ref) != 0) - { - ACE_CString list_of_profiles; + { + ACE_CString list_of_profiles; - // Used by the strtok_r. - char *lasts = 0; + // Used by the strtok_r. + char *lasts = 0; - // Append the given object ID to all the end-points of - // Default Init Ref. - for (char *str = ACE_OS::strtok_r (default_init_ref, + // Append the given object ID to all the end-points of + // Default Init Ref. + for (char *str = ACE_OS::strtok_r (default_init_ref, ",", &lasts); - str != 0 ; - str = ACE_OS::strtok_r (0, + str != 0 ; + str = ACE_OS::strtok_r (0, ",", &lasts)) - { - list_of_profiles += ACE_CString (str); - list_of_profiles += ACE_CString ("/"); - list_of_profiles += object_id; - list_of_profiles += ACE_CString (","); - } + { + list_of_profiles += ACE_CString (str); + list_of_profiles += ACE_CString ("/"); + list_of_profiles += object_id; + list_of_profiles += ACE_CString (","); + } - // Clean up. - delete [] default_init_ref; + // Clean up. + delete [] default_init_ref; - // Replace the last extra comma with a null. - list_of_profiles[list_of_profiles.length () - 1] = '\0'; + // Replace the last extra comma with a null. + list_of_profiles[list_of_profiles.length () - 1] = '\0'; - return this->string_to_object (list_of_profiles.c_str (), - TAO_IN_ENV); - } + return this->string_to_object (list_of_profiles.c_str (), + ACE_TRY_ENV); + } delete default_init_ref; } @@ -888,7 +921,7 @@ CORBA_ORB::resolve_initial_references (CORBA::String name, if (ACE_OS::strcmp (name, TAO_OBJID_NAMESERVICE) == 0) return this->resolve_service ("NameService", - timeout); + timeout); else if (ACE_OS::strcmp (name, TAO_OBJID_TRADINGSERVICE) == 0) return this->resolve_trading_service (timeout); @@ -898,9 +931,15 @@ CORBA_ORB::resolve_initial_references (CORBA::String name, else if (ACE_OS::strcmp (name, TAO_OBJID_POACURRENT) == 0) return this->resolve_poa_current (); + else if (ACE_OS::strcmp (name, + TAO_OBJID_POLICYMANAGER) == 0) + return this->resolve_policy_manager (ACE_TRY_ENV); + else if (ACE_OS::strcmp (name, + TAO_OBJID_POLICYCURRENT) == 0) + return this->resolve_policy_current (ACE_TRY_ENV); else return this->resolve_service (name, - timeout); + timeout); } TAO_Stub * @@ -1355,8 +1394,8 @@ CORBA_ORB::string_to_object (const char *str, ACE_TRY_ENV); else if (ACE_OS::strncmp (str, - iioploc_prefix, - sizeof iioploc_prefix - 1) == 0) + iioploc_prefix, + sizeof iioploc_prefix - 1) == 0) obj = this->iioploc_string_to_object (str + sizeof iioploc_prefix - 1, ACE_TRY_ENV); @@ -1440,8 +1479,8 @@ CORBA_ORB::iiop_string_to_object (const char *string, // Allocate a Multiple Profile with the given no. of profiles. TAO_MProfile *mp; ACE_NEW_RETURN (mp, - TAO_MProfile (1), - obj); + TAO_MProfile (1), + obj); TAO_Profile* pfile; ACE_NEW_RETURN (pfile, @@ -1480,7 +1519,7 @@ CORBA_ORB::iiop_string_to_object (const char *string, // object with multiple profiles and then the object reference. CORBA::Object_ptr CORBA_ORB::iioploc_string_to_object (const char *string, - CORBA::Environment &env) + CORBA::Environment &env) { CORBA::Object_ptr obj = CORBA::Object::_nil (); @@ -1501,7 +1540,7 @@ CORBA_ORB::iioploc_string_to_object (const char *string, i++) { if (*(list_of_profiles + i) == ',') - profile_count++; + profile_count++; } TAO_MProfile mp (profile_count); @@ -1517,9 +1556,9 @@ CORBA_ORB::iioploc_string_to_object (const char *string, { ACE_NEW_RETURN (pfile, - TAO_IIOP_Profile (str, - env), - CORBA::Object::_nil ()); + TAO_IIOP_Profile (str, + env), + CORBA::Object::_nil ()); // Give up ownership of the profile. mp.give_profile (pfile); @@ -1601,10 +1640,10 @@ CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj) // #if 0's around! #if 0 ACE_ERROR ((LM_ERROR, - "%p: Passing IIOP ORB and non-IIOP object\n", - "_get_collocated_object")); + "%p: Passing IIOP ORB and non-IIOP object\n", + "_get_collocated_object")); #endif - // Something must be wrong! + // Something must be wrong! return 0; } #if 0 @@ -1689,7 +1728,7 @@ CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj) #if 0 ACE_DEBUG ((LM_DEBUG, - "CORBA_ORB: collocation failed for \n")); + "CORBA_ORB: collocation failed for \n")); #endif return 0; @@ -1704,8 +1743,8 @@ CORBA_ORB::_tao_add_to_IOR_table (ACE_CString &object_id, { if (CORBA::is_nil (obj)) ACE_ERROR_RETURN ((LM_ERROR, - "Unable to add IOR to table\n"), - -1); + "Unable to add IOR to table\n"), + -1); CORBA::String_var string = this->object_to_string (obj); @@ -1717,8 +1756,8 @@ CORBA_ORB::_tao_add_to_IOR_table (ACE_CString &object_id, if (this->lookup_table_.add_ior (object_id, ior) != 0) ACE_ERROR_RETURN ((LM_ERROR, - "Unable to add IOR to table\n"), - -1); + "Unable to add IOR to table\n"), + -1); return 0; } @@ -1732,8 +1771,8 @@ CORBA_ORB::_tao_find_in_IOR_table (ACE_CString &object_id, if (this->lookup_table_.find_ior (object_id, ior) != 0) ACE_ERROR_RETURN ((LM_ERROR, - "No match for the given ObjectID\n"), - -1); + "No match for the given ObjectID\n"), + -1); obj = this->string_to_object (ior.c_str ()); diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index cffafdcc1c3..ad678136031 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -356,11 +356,11 @@ public: // one, otherwise, return 0. Each type of ORB, e. g., IIOP ORB, // must implement this and determine what is a collocated object // based on information provided in the TAO_Stub. - + virtual int _tao_add_to_IOR_table (ACE_CString &object_id, CORBA::Object_ptr obj); // Add a mapping ObjectID->IOR to the table. - + virtual int _tao_find_in_IOR_table (ACE_CString &object_id, CORBA::Object_ptr &obj); // Find the given ObjectID in the table. @@ -369,13 +369,13 @@ public: TAO_POA_Manager *poa_manager = 0, const TAO_POA_Policies *policies = 0); // Resolve the POA. - + TAO_Stub *create_stub_object (const TAO_ObjectKey &key, const char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // Makes sure that the ORB is open and then creates an IIOP object // based on the endpoint. - + CORBA_Object_ptr key_to_object (const TAO_ObjectKey &key, const char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); @@ -447,6 +447,11 @@ protected: CORBA_Object_ptr resolve_poa_current (void); // Resolve the POA current. + CORBA_Object_ptr resolve_policy_manager (CORBA::Environment&); + // Resolve the Policy Manager for this ORB. + CORBA_Object_ptr resolve_policy_current (CORBA::Environment&); + // Resolve the Policy Current for this thread. + int run (ACE_Time_Value *tv, int break_on_timeouts); // Implements the run routine diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 72fcc7e1443..fafa7de8abd 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -59,11 +59,11 @@ TAO_ORB_Core::TAO_ORB_Core (void) #endif /* TAO_ARL_USES_SAME_CONNECTOR_PORT */ preconnections_ (0), default_environment_ (0), - tss_environment_ (this) + tss_environment_ (this), + policy_current_ (&this->initial_policy_current_) { } - TAO_ORB_Core::~TAO_ORB_Core (void) { // This should probably be changed to use the allocator internal to diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 8f72d2678dd..15aa540c1bf 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -24,10 +24,9 @@ #include "tao/Environment.h" #include "tao/IIOP_Connector.h" #include "tao/IIOP_Acceptor.h" -#include "tao/POAC.h" #include "tao/POA.h" -#include "tao/POAManager.h" -#include "tao/Object_Adapter.h" + +#include "tao/Policy_Manager.h" #include "tao/params.h" @@ -301,7 +300,26 @@ public: // usually created on the stack, but, the spec allows their creation // on the heap and/or as class members; we need to investigate the // tradeoffs and take a decision. - // + +#if defined (TAO_HAS_CORBA_MESSAGING) + TAO_Policy_Manager *policy_manager (void); + // Return the Policy_Manager for this ORB. + + TAO_Policy_Current *policy_current (void) const; + void policy_current (TAO_Policy_Current *); + // Accesors to the policy current, this object should be kept in TSS + // storage. + // The POA has to reset the policy current object on every upcall. + + CORBA::Policy_ptr get_default_policy ( + CORBA::PolicyType policy, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment ()); + // Accesor to obtain the default policy for a particular policy + // type. + // If there is no default policy it returns CORBA::Policy::_nil () + +#endif /* TAO_HAS_CORBA_MESSAGING */ protected: int set_endpoint (int dotted_decimal_addresses, @@ -415,6 +433,22 @@ protected: CORBA_Environment tss_environment_; // If the user (or library) provides no environment the ORB_Core // still holds one. + +#if defined (TAO_HAS_CORBA_MESSAGING) + TAO_Policy_Manager policy_manager_; + // The Policy_Manager for this ORB. + + TAO_Policy_Current initial_policy_current_; + // The initial PolicyCurrent for this thread. Should be a TSS + // resource. + + TAO_Policy_Current* policy_current_; + // This pointer is reset by the POA on each upcall. + + TAO_Policy_Manager_Impl default_policies_; + // The default policies. +#endif /* TAO_HAS_CORBA_MESSAGING */ + }; class TAO_Default_Reactor : public ACE_Reactor diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index 843a8821ae3..30cb817a2cb 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -149,6 +149,35 @@ TAO_ORB_Core::create_input_cdr_data_block (size_t size) return this->resource_factory ()->create_input_cdr_data_block (size); } +#if defined (TAO_HAS_CORBA_MESSAGING) +ACE_INLINE TAO_Policy_Manager* +TAO_ORB_Core::policy_manager (void) +{ + return &this->policy_manager_; +} + +ACE_INLINE TAO_Policy_Current* +TAO_ORB_Core::policy_current (void) const +{ + return this->policy_current_; +} + +ACE_INLINE void +TAO_ORB_Core::policy_current (TAO_Policy_Current* current) +{ + this->policy_current_ = current; +} + +ACE_INLINE CORBA::Policy_ptr +TAO_ORB_Core::get_default_policy ( + CORBA::PolicyType policy, + CORBA::Environment &ACE_TRY_ENV) +{ + return this->default_policies_.get_policy (policy, ACE_TRY_ENV); +} + +#endif /* TAO_HAS_CORBA_MESSAGING */ + // **************************************************************** ACE_INLINE void diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 479f77266fa..34898f25bfa 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -344,6 +344,61 @@ CORBA_Object::_get_implementation (CORBA::Environment &) // **************************************************************** +#if defined (TAO_HAS_CORBA_MESSAGING) +CORBA::Policy_ptr +CORBA_Object::_get_policy ( + CORBA::PolicyType type, + CORBA::Environment &ACE_TRY_ENV) +{ + return this->_stubobj ()->get_policy (type, ACE_TRY_ENV); +} + +CORBA::Policy_ptr +CORBA_Object::_get_client_policy ( + CORBA::PolicyType type, + CORBA::Environment &ACE_TRY_ENV) +{ + return this->_stubobj ()->get_client_policy (type, ACE_TRY_ENV); +} + +CORBA::Object_ptr +CORBA_Object::_set_policy_overrides ( + const CORBA::PolicyList & policies, + CORBA::SetOverrideType set_add, + CORBA::Environment &ACE_TRY_ENV) +{ + TAO_Stub* stub = + this->_stubobj ()->set_policy_overrides (policies, + set_add, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + + return new CORBA_Object (stub, + this->servant_, + this->is_collocated_); +} + +CORBA::PolicyList * +CORBA_Object::_get_policy_overrides ( + const CORBA::PolicyTypeSeq & types, + CORBA::Environment &ACE_TRY_ENV) +{ + return this->_stubobj ()->get_policy_overrides (types, ACE_TRY_ENV); +} + +CORBA::Boolean +CORBA_Object::_validate_connection ( + CORBA::PolicyList_out inconsistent_policies, + CORBA::Environment &ACE_TRY_ENV) +{ + return this->_stubobj ()->validate_connection (inconsistent_policies, + ACE_TRY_ENV); +} + +#endif /* TAO_HAS_CORBA_MESSAGING */ + +// **************************************************************** + CORBA::Boolean operator<< (TAO_OutputCDR& cdr, const CORBA_Object* x) { diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index ce14dcfc324..977838fd88b 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -33,6 +33,9 @@ class TAO_Stub; class TAO_Export CORBA_Object { public: + virtual ~CORBA_Object (void); + // destructor + static CORBA_Object_ptr _duplicate (CORBA_Object_ptr obj); // increment the ref count @@ -98,6 +101,35 @@ public: #endif /* TAO_HAS_MINIMUM_CORBA */ +#if defined (TAO_HAS_CORBA_MESSAGING) + CORBA::Policy_ptr _get_policy ( + CORBA::PolicyType type, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); + CORBA::Policy_ptr _get_client_policy ( + CORBA::PolicyType type, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); + CORBA::Object_ptr _set_policy_overrides ( + const CORBA::PolicyList & policies, + CORBA::SetOverrideType set_add, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); + CORBA::PolicyList * _get_policy_overrides ( + const CORBA::PolicyTypeSeq & types, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); + CORBA::Boolean _validate_connection ( + CORBA::PolicyList_out inconsistent_policies, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); +#endif /* TAO_HAS_CORBA_MESSAGING */ + virtual CORBA::ULong _hash (CORBA::ULong maximum, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // Return a (potentially non-unique) hash value for this object. @@ -113,6 +145,18 @@ public: // private state. Since that changes easily (when different ORB // protocols are in use) there is no default implementation. + virtual TAO_ObjectKey *_key (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + // Return the object key as an out parameter. Caller should release + // return value when finished with it. + +#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 + typedef CORBA_Object_ptr _ptr_type; + typedef CORBA_Object_var _var_type; +#endif /* __GNUC__ */ + // Useful for template programming. + + // = TAO extensions + // = Reference count managment. CORBA::ULong _incr_refcnt (void); // Increment the reference count. @@ -125,13 +169,6 @@ public: CORBA::Boolean collocated = 0); // constructor - virtual ~CORBA_Object (void); - // destructor - - virtual TAO_ObjectKey *_key (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); - // Return the object key as an out parameter. Caller should release - // return value when finished with it. - virtual TAO_Stub *_stubobj (void) const; // get the underlying stub object @@ -139,12 +176,6 @@ public: // the the object to use a locate request for the first call to // the object -#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 - typedef CORBA_Object_ptr _ptr_type; - typedef CORBA_Object_var _var_type; -#endif /* __GNUC__ */ - // Useful for template programming. - protected: TAO_ServantBase *servant_; // Servant pointer. It is 0 except for collocated objects. diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp new file mode 100644 index 00000000000..ab5aab9c9e4 --- /dev/null +++ b/TAO/tao/Policy_Manager.cpp @@ -0,0 +1,182 @@ +// $Id$ + +#if defined (TAO_HAS_CORBA_MESSAGING) + +#include "tao/Policy_Manager.h" +#include "tao/Environment.h" + +#if !defined (__ACE_INLINE__) +# include "tao/Policy_Manager.i" +#endif /* ! __ACE_INLINE__ */ + +ACE_RCSID(tao, Policy_Manager, "$Id$") + +void +TAO_Policy_Manager_Impl::set_policy_overrides ( + const CORBA::PolicyList & policies, + CORBA::SetOverrideType set_add, + CORBA::Environment &ACE_TRY_ENV) +{ + // @@ The spec does not say what to do on this case. + if (set_add != CORBA::SET_OVERRIDE + && set_add != CORBA::ADD_OVERRIDE) + ACE_THROW (CORBA::BAD_PARAM (CORBA::COMPLETED_NO)); + + CORBA::InvalidPolicies invalid_policies; + invalid_policies.indices.length (policies.length ()); + int n = 0; + for (CORBA::ULong i = 0; i < policies.length (); ++i) + { + CORBA::Policy_ptr policy = policies[i]; + if (CORBA::is_nil (policy)) + continue; + + CORBA::ULong index = policy->policy_type (ACE_TRY_ENV); + ACE_CHECK; + + if (TAO_MIN_PROPIETARY_POLICY <= index + && index < TAO_MAX_PROPIETARY_POLICY) + index -= TAO_MIN_PROPIETARY_POLICY; + + if (index >= TAO_MAX_POLICIES) + invalid_policies.indices[n++] = CORBA::UShort (i); + } + if (n != 0) + { + invalid_policies.indices.length (n); + ACE_THROW (CORBA::InvalidPolicies (invalid_policies)); + } + + if (set_add == CORBA::SET_OVERRIDE) + { + for (int i = 0; i < TAO_MAX_POLICIES; ++i) + { + this->policies_[i] = CORBA::Policy::_nil (); + } + this->count_ = 0; + } + + for (CORBA::ULong j = 0; j < policies.length (); ++j) + { + CORBA::Policy_ptr policy = policies[j]; + if (CORBA::is_nil (policy)) + continue; + + CORBA::ULong index = policy->policy_type (ACE_TRY_ENV); + ACE_CHECK; + + if (TAO_MIN_PROPIETARY_POLICY <= index + && index < TAO_MAX_PROPIETARY_POLICY) + index -= TAO_MIN_PROPIETARY_POLICY; + + // No need to validate the index... + if (CORBA::is_nil (this->policies_[index].in ())) + this->count_++; + + this->policies_[index] = + CORBA::Policy::_duplicate (policy); + } +} + +CORBA::PolicyList * +TAO_Policy_Manager_Impl::get_policy_overrides ( + const CORBA::PolicyTypeSeq & types, + CORBA::Environment &ACE_TRY_ENV) +{ + CORBA::ULong l = types.length (); + + CORBA::ULong slots = l; + if (slots == 0) + slots = this->count_; + + CORBA::PolicyList_var policy_list = + new CORBA::PolicyList (slots); + policy_list->length (slots); + + int n = 0; + if (types.length () == 0) + { + for (int i = 0; i < TAO_MAX_POLICIES; ++i) + { + if (CORBA::is_nil (this->policies_[i].in ())) + continue; + policy_list[n++] = + CORBA::Policy::_duplicate (this->policies_[i].in ()); + } + } + else + { + for (CORBA::ULong j = 0; j < types.length (); ++j) + { + CORBA::ULong index = types[j]; + + if (TAO_MIN_PROPIETARY_POLICY <= index + && index < TAO_MAX_PROPIETARY_POLICY) + index -= TAO_MIN_PROPIETARY_POLICY; + + if (index < TAO_MAX_POLICIES) + policy_list[n++] = + CORBA::Policy::_duplicate (this->policies_[index].in ()); + } + } + + policy_list->length (n); + return policy_list._retn (); +} + +CORBA::Policy_ptr +TAO_Policy_Manager_Impl::get_policy ( + CORBA::PolicyType type, + CORBA::Environment &ACE_TRY_ENV) +{ + CORBA::ULong index = type; + + if (TAO_MIN_PROPIETARY_POLICY <= index + && index < TAO_MAX_PROPIETARY_POLICY) + index -= TAO_MIN_PROPIETARY_POLICY; + + if (index >= TAO_MAX_POLICIES) + return CORBA::Policy::_nil (); + + return CORBA::Policy::_duplicate (this->policies_[index].in ()); +} + +// **************************************************************** + +CORBA::PolicyList * +TAO_Policy_Manager::get_policy_overrides ( + const CORBA::PolicyTypeSeq & ts, + CORBA::Environment &ACE_TRY_ENV) +{ + return this->impl_.get_policy_overrides (ts, ACE_TRY_ENV); +} + +void +TAO_Policy_Manager::set_policy_overrides ( + const CORBA::PolicyList & policies, + CORBA::SetOverrideType set_add, + CORBA::Environment &ACE_TRY_ENV) +{ + this->impl_.set_policy_overrides (policies, set_add, ACE_TRY_ENV); +} + +// **************************************************************** + +CORBA::PolicyList * +TAO_Policy_Current::get_policy_overrides ( + const CORBA::PolicyTypeSeq & ts, + CORBA::Environment &ACE_TRY_ENV) +{ + return this->impl_.get_policy_overrides (ts, ACE_TRY_ENV); +} + +void +TAO_Policy_Current::set_policy_overrides ( + const CORBA::PolicyList & policies, + CORBA::SetOverrideType set_add, + CORBA::Environment &ACE_TRY_ENV) +{ + this->impl_.set_policy_overrides (policies, set_add, ACE_TRY_ENV); +} + +#endif /* TAO_HAS_CORBA_MESSAGING */ diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h new file mode 100644 index 00000000000..9c7641573ac --- /dev/null +++ b/TAO/tao/Policy_Manager.h @@ -0,0 +1,154 @@ +// -*- C++ -*- +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// TAO +// +// = FILENAME +// Policy_Manager.h +// +// = DESCRIPTION +// An implementation for the CORBA::PolicyManager interface. +// +// = AUTHOR +// Carlos O'Ryan (coryan@cs.wustl.edu) +// +// ============================================================================ + +#ifndef TAO_POLICY_MANAGER_H +#define TAO_POLICY_MANAGER_H + +#if defined (TAO_HAS_CORBA_MESSAGING) + +#include "tao/POA_CORBA.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_Export TAO_Policy_Manager_Impl +{ + // + // = TITLE + // The policy manager implementation. + // + // = DESCRIPTION + // This class is used to implement both the CORBA::PolicyManager + // and the CORBA::PolicyCurrent interfaces. + // +public: + TAO_Policy_Manager_Impl (void); + // Constructor + + void set_policy_overrides ( + const CORBA::PolicyList & policies, + CORBA::SetOverrideType set_add, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); + // Modify the list of policies to include <policies>. + // If <set_add> is CORBA::SET_OVERRIDE then we replace all the old + // policies. If it is CORBA::ADD_OVERRIDE we simply add the policies + // in <policies>. + // No attempt is made to validate the policies for consitency. + + CORBA::PolicyList * get_policy_overrides ( + const CORBA::PolicyTypeSeq & types, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); + // Get the values (if any) for the policies in <types>, if <types> + // is an empty list the method returns *all* the current policies. + + CORBA::Policy_ptr get_policy ( + CORBA::PolicyType policy, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); + // Obtain a single policy. + +private: + CORBA::Policy_var policies_[TAO_MAX_POLICIES]; + // The policies + + CORBA::ULong count_; + // The number of non-nil policies... +}; + +// **************************************************************** + +class TAO_Export TAO_Policy_Manager : public POA_CORBA::PolicyManager +{ +public: + TAO_Policy_Manager (void); + // constructor + + CORBA::Policy_ptr get_policy ( + CORBA::PolicyType policy, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); + // Obtain a single policy. + + // = The CORBA::PolicyManager operations + + virtual CORBA::PolicyList * get_policy_overrides ( + const CORBA::PolicyTypeSeq & ts, + CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment::default_environment () + ); + virtual void set_policy_overrides ( + const CORBA::PolicyList & policies, + CORBA::SetOverrideType set_add, + CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment::default_environment () + ); + +private: + TAO_Policy_Manager_Impl impl_; + // The implementation. +}; + +// **************************************************************** + +class TAO_Export TAO_Policy_Current : public POA_CORBA::PolicyCurrent +{ +public: + TAO_Policy_Current (void); + // constructor + + CORBA::Policy_ptr get_policy ( + CORBA::PolicyType policy, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); + // Obtain a single policy. + + // = The CORBA::PolicyManager operations + + virtual CORBA::PolicyList * get_policy_overrides ( + const CORBA::PolicyTypeSeq & ts, + CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment::default_environment () + ); + virtual void set_policy_overrides ( + const CORBA::PolicyList & policies, + CORBA::SetOverrideType set_add, + CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment::default_environment () + ); + +private: + TAO_Policy_Manager_Impl impl_; + // The implementation. +}; + +#if defined (__ACE_INLINE__) +# include "tao/Policy_Manager.i" +#endif /* __ACE_INLINE__ */ + +#endif /* TAO_HAS_CORBA_MESSAGING */ + +#endif /* TAO_POLICY_MANAGER_H */ diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i new file mode 100644 index 00000000000..2926fbd39ec --- /dev/null +++ b/TAO/tao/Policy_Manager.i @@ -0,0 +1,38 @@ +// $Id$ + +ACE_INLINE +TAO_Policy_Manager_Impl::TAO_Policy_Manager_Impl (void) + : count_ (0) +{ +} + +// **************************************************************** + +ACE_INLINE +TAO_Policy_Manager::TAO_Policy_Manager (void) +{ +} + +ACE_INLINE CORBA::Policy_ptr +TAO_Policy_Manager::get_policy ( + CORBA::PolicyType policy, + CORBA::Environment &ACE_TRY_ENV) +{ + return this->impl_.get_policy (policy, ACE_TRY_ENV); +} + +// **************************************************************** + +ACE_INLINE +TAO_Policy_Current::TAO_Policy_Current (void) +{ +} + +ACE_INLINE CORBA::Policy_ptr +TAO_Policy_Current::get_policy ( + CORBA::PolicyType policy, + CORBA::Environment &ACE_TRY_ENV) +{ + return this->impl_.get_policy (policy, ACE_TRY_ENV); +} + diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index abb3c3306a1..929460f41d2 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -19,6 +19,7 @@ #include "tao/Invocation.h" #include "tao/ORB_Core.h" #include "tao/Client_Strategy_Factory.h" +#include "ace/Auto_Ptr.h" #if !defined (__ACE_INLINE__) # include "tao/Stub.i" @@ -72,7 +73,8 @@ TAO_Stub::TAO_Stub (char *repository_id, refcount_ (1), use_locate_request_ (0), first_locate_request_ (0), - orb_core_ (orb_core) + orb_core_ (orb_core), + policies_ (0) { if (this->orb_core_ == 0) { @@ -831,3 +833,134 @@ TAO_Stub::put_params (TAO_GIOP_Invocation &call, } #endif /* TAO_HAS_MINIMUM_CORBA */ + +// **************************************************************** + +#if defined (TAO_HAS_CORBA_MESSAGING) +CORBA::Policy_ptr +TAO_Stub::get_policy ( + CORBA::PolicyType type, + CORBA::Environment &ACE_TRY_ENV) +{ + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + this->refcount_lock_, + CORBA::Policy::_nil ()); + + if (this->policies_ == 0) + return CORBA::Policy::_nil (); + + return this->policies_->get_policy (type, ACE_TRY_ENV); +} + +CORBA::Policy_ptr +TAO_Stub::get_client_policy ( + CORBA::PolicyType type, + CORBA::Environment &ACE_TRY_ENV) +{ + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + this->refcount_lock_, + CORBA::Policy::_nil ()); + + CORBA::Policy_var result; + if (this->policies_ != 0) + { + result = this->policies_->get_policy (type, ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + } + + if (CORBA::is_nil (result.in ())) + { + TAO_Policy_Current *policy_current = + this->orb_core_->policy_current (); + if (policy_current != 0) + { + result = policy_current->get_policy (type, ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + } + } + + if (CORBA::is_nil (result.in ())) + { + TAO_Policy_Manager *policy_manager = + this->orb_core_->policy_manager (); + if (policy_manager != 0) + { + result = policy_manager->get_policy (type, ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + } + } + + if (CORBA::is_nil (result.in ())) + { + result = this->orb_core_->get_default_policy (type, ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + } + + return result._retn (); +} + +TAO_Stub* +TAO_Stub::set_policy_overrides ( + const CORBA::PolicyList & policies, + CORBA::SetOverrideType set_add, + CORBA::Environment &ACE_TRY_ENV) +{ + auto_ptr<TAO_Policy_Manager_Impl> policy_manager = + new TAO_Policy_Manager_Impl; + + + if (set_add == CORBA::SET_OVERRIDE) + { + policy_manager->set_policy_overrides (policies, + set_add, + ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + } + else if (this->policies_ == 0) + { + policy_manager->set_policy_overrides (policies, + CORBA::SET_OVERRIDE, + ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + } + else + { + *policy_manager = *this->policies_; + policy_manager->set_policy_overrides (policies, + set_add, + ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + } + + TAO_Stub* stub; + ACE_NEW_RETURN (stub, TAO_Stub (CORBA::string_dup (this->type_id.in ()), + this->get_profiles (), + this->orb_core_), + 0); + stub->policies_ = policy_manager.release (); + return stub; +} + +CORBA::PolicyList * +TAO_Stub::get_policy_overrides ( + const CORBA::PolicyTypeSeq & types, + CORBA::Environment &ACE_TRY_ENV) +{ + if (this->policies_ == 0) + return 0; + + return this->policies_->get_policy_overrides (types, ACE_TRY_ENV); +} + +CORBA::Boolean +TAO_Stub::validate_connection ( + CORBA::PolicyList_out inconsistent_policies, + CORBA::Environment &ACE_TRY_ENV) +{ + // @@ What is a good default value to return.... + inconsistent_policies = 0; + return 0; +} + +#endif /* TAO_HAS_CORBA_MESSAGING */ + diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index e3866ddbdbc..15685eb7c38 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -37,6 +37,7 @@ class TAO_GIOP_Invocation; class TAO_ORB_Core; +class TAO_Policy_Manager_Impl; // Descriptions of parameters. @@ -256,6 +257,35 @@ public: #endif /* TAO_HAS_MINIMUM_CORBA */ +#if defined (TAO_HAS_CORBA_MESSAGING) + CORBA::Policy_ptr get_policy ( + CORBA::PolicyType type, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); + CORBA::Policy_ptr get_client_policy ( + CORBA::PolicyType type, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); + TAO_Stub* set_policy_overrides ( + const CORBA::PolicyList & policies, + CORBA::SetOverrideType set_add, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); + CORBA::PolicyList * get_policy_overrides ( + const CORBA::PolicyTypeSeq & types, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); + CORBA::Boolean validate_connection ( + CORBA::PolicyList_out inconsistent_policies, + CORBA::Environment &ACE_TRY_ENV = + CORBA::default_environment () + ); +#endif /* TAO_HAS_CORBA_MESSAGING */ + CORBA::String_var type_id; // All objref representations carry around a type ID. @@ -434,6 +464,12 @@ private: TAO_ORB_Core* orb_core_; // The ORB +#if defined (TAO_HAS_CORBA_MESSAGING) + TAO_Policy_Manager_Impl* policies_; + // The policy overrides in this object, if nil then use the default + // policies. +#endif /* TAO_HAS_CORBA_MESSAGING */ + // = Disallow copy constructor and assignment operator ACE_UNIMPLEMENTED_FUNC (TAO_Stub (const TAO_Stub &)) ACE_UNIMPLEMENTED_FUNC (TAO_Stub &operator = (const TAO_Stub &)) diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index 8f1ae7fd9a9..282146552be 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -250,6 +250,8 @@ #define TAO_OBJID_ROOTPOA "RootPOA" #define TAO_OBJID_POACURRENT "POACurrent" #define TAO_OBJID_INTERFACEREP "InterfaceRepository" +#define TAO_OBJID_POLICYMANAGER "ORBPolicyManager" +#define TAO_OBJID_POLICYCURRENT "PolicyCurrent" // The Root POA default name. #define TAO_DEFAULT_ROOTPOA_NAME "" @@ -257,4 +259,28 @@ // Minimum CORBA // #define TAO_HAS_MINIMUM_CORBA +// CORBA Messaging +// #define TAO_HAS_CORBA_MESSAGING + +// The maximum value for an standard PolicyType, we use this trick to +// pack the standard policies and the TAO extension in a single +// array. +// The motivation for such a low-level optimization is that policies +// can be set on a per-object level, allocating a complex data +// structure (such as a hash map) or a big array for each object is +// not feasible. +#define TAO_MAX_STANDARD_POLICIES 64 + +// The number of TAO specific policies +#define TAO_POLICIES_COUNT 32 + +// The size of the Policy array, the number of policies supported in +// TAO is limited by this number. +#define TAO_MAX_POLICIES (TAO_MAX_STANDARD_POLICIES+TAO_POLICIES_COUNT) + +// TAO may define its own policies, they are defined in a range far +// from the standard policies. +#define TAO_MIN_PROPIETARY_POLICY 1024 +#define TAO_MAX_PROPIETARY_POLICY (TAO_MIN_PROPIETARY_POLICY+TAO_POLICIES_COUNT) + #endif /* TAO_ORB_CONFIG_H */ diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile index 3742f505e22..62a9fe8620e 100644 --- a/TAO/tests/Param_Test/Makefile +++ b/TAO/tests/Param_Test/Makefile @@ -99,8 +99,6 @@ TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE CPPFLAGS += -I$(TAO_ROOT) $(TSS_ORB_FLAG) .PRECIOUS: $(IDL_HDR) $(IDL_SRC) -#$(IDL_HDR) $(IDL_SRC): param_test.idl -# $(TAO_IDL/tao_idl param_test.idl server: $(addprefix $(VDIR),$(PARAM_TEST_SVR_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) |