From 0c4c4ef5fefc6e179905dce34012af3bfac96ac3 Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Fri, 15 Jun 2001 22:39:45 +0000 Subject: *** empty log message *** --- TAO/orbsvcs/tests/LoadBalancing/HasherFactory.h | 2 +- TAO/orbsvcs/tests/LoadBalancing/Makefile | 544 +++++++++++------------- TAO/orbsvcs/tests/LoadBalancing/client.cpp | 12 +- TAO/orbsvcs/tests/LoadBalancing/server.cpp | 7 +- 4 files changed, 252 insertions(+), 313 deletions(-) diff --git a/TAO/orbsvcs/tests/LoadBalancing/HasherFactory.h b/TAO/orbsvcs/tests/LoadBalancing/HasherFactory.h index f392afc2307..d94a9e72f09 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/HasherFactory.h +++ b/TAO/orbsvcs/tests/LoadBalancing/HasherFactory.h @@ -31,7 +31,7 @@ * process but each will reside at different logical locations. */ class HasherFactory - : public virtual POA_TAO_LoadBalancing::GenericFactory + : public virtual POA_LoadBalancing::GenericFactory { public: diff --git a/TAO/orbsvcs/tests/LoadBalancing/Makefile b/TAO/orbsvcs/tests/LoadBalancing/Makefile index a4ed4caf4b3..e22bd20368e 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/Makefile +++ b/TAO/orbsvcs/tests/LoadBalancing/Makefile @@ -14,14 +14,14 @@ endif # ! TAO_ROOT LDLIBS = -lTAO_LoadBalancing -lTAO_PortableServer -lTAO -IDL_FILES = Hash_Replica -IDL_SRC = Hash_ReplicaC.cpp Hash_ReplicaS.cpp +IDL_FILES = Hasher +IDL_SRC = HasherC.cpp HasherS.cpp BIN_UNCHECKED = client server -SRC = $(addsuffix .cpp, $(BIN_UNCHECKED) Hash_ReplicaControl Hash_Replica_i) $(IDL_SRC) +SRC = $(addsuffix .cpp, $(BIN_UNCHECKED) HasherFactory Hasher_i) $(IDL_SRC) -CLIENT_OBJS = client.o Hash_ReplicaC.o -SERVER_OBJS = server.o Hash_ReplicaControl.o Hash_Replica_i.o $(IDL_SRC:.cpp=.o) +CLIENT_OBJS = client.o HasherC.o +SERVER_OBJS = server.o HasherFactory.o Hasher_i.o $(IDL_SRC:.cpp=.o) TAO_IDLFLAGS += -Ge 1 @@ -59,17 +59,20 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS)) realclean: clean -$(RM) $(BIN_UNCHECKED) - -$(RM) $(foreach ext, $(IDL_EXT), Hash_Replica$(ext)) + -$(RM) $(foreach ext, $(IDL_EXT), Hasher$(ext)) + + +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Hash_ReplicaC.h \ +.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp HasherC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -210,6 +213,7 @@ realclean: clean $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -219,13 +223,31 @@ realclean: clean $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -233,25 +255,16 @@ realclean: clean $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - Hash_ReplicaC.i $(ACE_ROOT)/ace/Get_Opt.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + HasherC.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Stats.h \ $(ACE_ROOT)/ace/Basic_Stats.h \ @@ -261,11 +274,10 @@ realclean: clean $(ACE_ROOT)/ace/High_Res_Timer.i .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/tao/corba.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -274,13 +286,6 @@ realclean: clean $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ @@ -291,6 +296,8 @@ realclean: clean $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -304,6 +311,12 @@ realclean: clean $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ @@ -406,6 +419,7 @@ realclean: clean $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -415,13 +429,31 @@ realclean: clean $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -429,28 +461,23 @@ realclean: clean $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.i \ - Hash_ReplicaControl.h Hash_Replica_i.h Hash_ReplicaS.h \ - Hash_ReplicaC.h Hash_ReplicaC.i \ + PropertyManagerTest.h HasherFactory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.h \ + $(TAO_ROOT)/tao/PortableInterceptorS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ @@ -466,24 +493,19 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - Hash_ReplicaS_T.h Hash_ReplicaS_T.i Hash_ReplicaS_T.cpp \ - Hash_ReplicaS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i + $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.i -.obj/Hash_ReplicaControl.o .obj/Hash_ReplicaControl.so .shobj/Hash_ReplicaControl.o .shobj/Hash_ReplicaControl.so: Hash_ReplicaControl.cpp Hash_ReplicaControl.h \ - Hash_Replica_i.h Hash_ReplicaS.h Hash_ReplicaC.h \ - $(TAO_ROOT)/tao/corba.h \ +.obj/HasherFactory.o .obj/HasherFactory.so .shobj/HasherFactory.o .shobj/HasherFactory.so: HasherFactory.cpp HasherFactory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(TAO_ROOT)/tao/PortableInterceptorS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -492,6 +514,7 @@ realclean: clean $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -579,12 +602,7 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -596,16 +614,13 @@ realclean: clean $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -613,45 +628,62 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/Principal.i \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/DomainC.h \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -665,7 +697,10 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - Hash_ReplicaC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ @@ -681,110 +716,21 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - Hash_ReplicaS_T.h Hash_ReplicaS_T.i Hash_ReplicaS_T.cpp \ - Hash_ReplicaS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.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 \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ - $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ - $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ - $(TAO_ROOT)/tao/Object_Ref_Table.h \ - $(TAO_ROOT)/tao/RT_Policy_i.h \ - $(TAO_ROOT)/tao/RT_Policy_i.i \ - $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(TAO_ROOT)/tao/BiDir_Adapter.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.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/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/ORB_Core.i + $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.i -.obj/Hash_Replica_i.o .obj/Hash_Replica_i.so .shobj/Hash_Replica_i.o .shobj/Hash_Replica_i.so: Hash_Replica_i.cpp \ - $(ACE_ROOT)/ace/ACE.h \ +.obj/Hasher_i.o .obj/Hasher_i.so .shobj/Hasher_i.o .shobj/Hasher_i.so: Hasher_i.cpp Hasher_i.h HasherS.h HasherC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -793,6 +739,13 @@ realclean: clean $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ @@ -803,8 +756,6 @@ realclean: clean $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -817,12 +768,7 @@ realclean: clean $(ACE_ROOT)/ace/Init_ACE.i \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i Hash_Replica_i.h \ - Hash_ReplicaS.h Hash_ReplicaC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ @@ -925,6 +871,7 @@ realclean: clean $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -934,13 +881,31 @@ realclean: clean $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -948,25 +913,15 @@ realclean: clean $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - Hash_ReplicaC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + HasherC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ @@ -982,24 +937,11 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - Hash_ReplicaS_T.h Hash_ReplicaS_T.i Hash_ReplicaS_T.cpp \ - Hash_ReplicaS.i Hash_ReplicaControl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.i + HasherS_T.h HasherS_T.i HasherS_T.cpp HasherS.i -.obj/Hash_ReplicaC.o .obj/Hash_ReplicaC.so .shobj/Hash_ReplicaC.o .shobj/Hash_ReplicaC.so: Hash_ReplicaC.cpp Hash_ReplicaC.h \ +.obj/HasherC.o .obj/HasherC.so .shobj/HasherC.o .shobj/HasherC.so: HasherC.cpp HasherC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1140,6 +1082,7 @@ realclean: clean $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -1149,13 +1092,31 @@ realclean: clean $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -1163,25 +1124,16 @@ realclean: clean $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - Hash_ReplicaC.i $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + HasherC.i \ + $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/MProfile.h \ @@ -1205,16 +1157,6 @@ realclean: clean $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ @@ -1266,7 +1208,6 @@ realclean: clean $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ @@ -1291,19 +1232,21 @@ realclean: clean $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ $(TAO_ROOT)/tao/RequestInfo_Util.h -.obj/Hash_ReplicaS.o .obj/Hash_ReplicaS.so .shobj/Hash_ReplicaS.o .shobj/Hash_ReplicaS.so: Hash_ReplicaS.cpp Hash_ReplicaS.h Hash_ReplicaC.h \ +.obj/HasherS.o .obj/HasherS.so .shobj/HasherS.o .shobj/HasherS.so: HasherS.cpp HasherS.h HasherC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1444,6 +1387,7 @@ realclean: clean $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/BoundsC.h \ @@ -1453,13 +1397,31 @@ realclean: clean $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -1467,25 +1429,15 @@ realclean: clean $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - $(TAO_ROOT)/tao/DomainC.i \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - Hash_ReplicaC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + HasherC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ @@ -1501,10 +1453,7 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ - Hash_ReplicaS_T.h Hash_ReplicaS_T.i Hash_ReplicaS_T.cpp \ - Hash_ReplicaS.i \ + HasherS_T.h HasherS_T.i HasherS_T.cpp HasherS.i \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ @@ -1558,18 +1507,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ @@ -1606,7 +1547,6 @@ realclean: clean $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -1631,10 +1571,12 @@ realclean: clean $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/RequestInfo_Util.h + $(ACE_ROOT)/ace/Dynamic_Service.cpp # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/LoadBalancing/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/client.cpp index d4c936ef07c..caa1037153e 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/client.cpp @@ -4,14 +4,14 @@ // TAO Load Balancer test client -#include "Hash_ReplicaC.h" +#include "HasherC.h" #include "ace/Get_Opt.h" #include "ace/Stats.h" #include "ace/High_Res_Timer.h" static void run_test (int iterations, int timeout, - Hash_Replica_ptr hasher, + Hasher_ptr hasher, CORBA::Environment &ACE_TRY_ENV); int @@ -64,9 +64,9 @@ main (int argc, char *argv[]) orb->string_to_object (ior, ACE_TRY_ENV); ACE_TRY_CHECK; - Hash_Replica_var hasher = - Hash_Replica::_unchecked_narrow (obj.in (), - ACE_TRY_ENV); + Hasher_var hasher = + Hasher::_unchecked_narrow (obj.in (), + ACE_TRY_ENV); ACE_TRY_CHECK; if (CORBA::is_nil (hasher.in ())) @@ -92,7 +92,7 @@ main (int argc, char *argv[]) void run_test (int iterations, int timeout, - Hash_Replica_ptr hasher, + Hasher_ptr hasher, CORBA::Environment &ACE_TRY_ENV) { ACE_Time_Value tv (0, timeout * 1000); diff --git a/TAO/orbsvcs/tests/LoadBalancing/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/server.cpp index 29dc5763a0b..8b33085fdfc 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/server.cpp @@ -81,16 +81,13 @@ main (int argc, char *argv[]) if (parse_args (argc, argv) != 0) return -1; - // @@ Is _interface_repository_id() portable? - const char * type_id = replica->_interface_repository_id (); - // Obtain Reference to the TAO LoadBalancer ReplicationManager CORBA::Object_var lb = orb->resolve_initial_references ("TAO_LoadBalancer", ACE_TRY_ENV); ACE_TRY_CHECK; - TAO_LoadBalancer::GenericFactory_var factory = + LoadBalancing::GenericFactory_var factory = TAO_LoadBalancer::GenericFactory::_narrow (lb.in (), ACE_TRY_ENV); ACE_TRY_CHECK; @@ -113,7 +110,7 @@ main (int argc, char *argv[]) // Run the PropertyManager tests, in addition to setting up the // Load Balancer for the remainder of this test. - // The FactoryCreationId + // The FactoryCreationId TAO_LoadBalancer::FactoryCreationId_var factory_creation_id; // Create a replicated Hasherobject (object group) -- cgit v1.2.1