diff options
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/Makefile | 274 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/Nestea.idl | 1 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/Repository.cpp | 208 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/Repository.h | 35 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/Repository_Test.cpp | 17 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/implrepo.conf | 7 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp | 24 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h | 5 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp | 5 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp | 1 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/svc.conf | 1 |
11 files changed, 126 insertions, 452 deletions
diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile b/TAO/orbsvcs/tests/ImplRepo/Makefile index 6f4b5de971f..922b657c7c2 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Makefile +++ b/TAO/orbsvcs/tests/ImplRepo/Makefile @@ -17,7 +17,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_ROOT) IDL_SRC = AirplaneS.cpp AirplaneC.cpp NesteaS.cpp NesteaC.cpp -PROG_SRCS = Repository.cpp \ +PROG_SRCS = \ Repository_Test.cpp \ airplane_client.cpp \ airplane_server.cpp \ @@ -29,7 +29,7 @@ PROG_SRCS = Repository.cpp \ nestea_client_i.cpp \ nestea_server_i.cpp \ nestea_i.cpp \ - IR_Helper.cpp + IR_Helper.cpp SRC=$(IDL_SRC) $(PROG_SRCS) @@ -57,9 +57,9 @@ NESTEA_SERVER_OBJS = NesteaC.o \ nestea_i.o \ IR_Helper.o - -REPOSITORY_TEST_OBJS = ../../../ImplRepo_Service/$(VDIR)/Repository.o \ - Repository_Test.o +REPOSITORY_TEST_OBJS = Repository_Test.o \ + Repository.o \ + Options.o VLDLIBS = $(LDLIBS:%=%$(VAR)) @@ -86,6 +86,7 @@ include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU include $(TAO_ROOT)/taoconfig.mk #---------------------------------------------------------------------------- @@ -115,6 +116,15 @@ realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), Airplane$(ext)) \ $(foreach ext, $(IDL_EXT), Nestea$(ext)) +$(VDIR)Repository.$(OBJEXT): ../../ImplRepo_Service/Repository.cpp + $(COMPILE.cc) -o $@ $< + ${MVCMD} + +$(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp + $(COMPILE.cc) -o $@ $< + ${MVCMD} + + # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. @@ -357,12 +367,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -375,6 +379,11 @@ realclean: clean $(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 \ @@ -622,12 +631,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -640,6 +643,11 @@ realclean: clean $(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 \ @@ -888,12 +896,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -906,6 +908,11 @@ realclean: clean $(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 \ @@ -1153,12 +1160,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -1171,6 +1172,11 @@ realclean: clean $(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 \ @@ -1179,9 +1185,9 @@ realclean: clean $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ NesteaC.i NesteaS.h NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i -.obj/Repository.o .obj/Repository.so .shobj/Repository.o .shobj/Repository.so: Repository.cpp Repository.h \ - $(ACE_ROOT)/ace/Naming_Context.h \ - $(ACE_ROOT)/ace/ACE.h \ +.obj/Repository_Test.o .obj/Repository_Test.so .shobj/Repository_Test.o .shobj/Repository_Test.so: Repository_Test.cpp \ + ../../ImplRepo_Service/Repository.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/streams.h \ @@ -1191,20 +1197,21 @@ realclean: clean $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.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/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/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_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.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1219,22 +1226,8 @@ realclean: clean $(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/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/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 \ @@ -1298,57 +1291,21 @@ realclean: clean $(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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(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/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Name_Proxy.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(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/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -1359,11 +1316,7 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Name_Request_Reply.h \ - $(ACE_ROOT)/ace/Name_Space.h + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h .obj/airplane_client.o .obj/airplane_client.so .shobj/airplane_client.o .shobj/airplane_client.so: airplane_client.cpp airplane_client_i.h AirplaneC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ @@ -1603,12 +1556,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -1621,6 +1568,11 @@ realclean: clean $(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 \ @@ -1870,12 +1822,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -1888,6 +1834,11 @@ realclean: clean $(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 \ @@ -2142,12 +2093,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -2160,6 +2105,11 @@ realclean: clean $(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 \ @@ -2413,12 +2363,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -2431,6 +2375,11 @@ realclean: clean $(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 \ @@ -2688,12 +2637,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -2706,6 +2649,11 @@ realclean: clean $(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 \ @@ -2953,12 +2901,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -2971,6 +2913,11 @@ realclean: clean $(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 \ @@ -3220,12 +3167,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -3238,6 +3179,11 @@ realclean: clean $(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 \ @@ -3490,12 +3436,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -3508,6 +3448,11 @@ realclean: clean $(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 \ @@ -3761,12 +3706,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -3779,6 +3718,11 @@ realclean: clean $(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 \ @@ -4035,12 +3979,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -4053,6 +3991,11 @@ realclean: clean $(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 \ @@ -4312,12 +4255,6 @@ realclean: clean $(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/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/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -4330,6 +4267,11 @@ realclean: clean $(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/orbsvcs/tests/ImplRepo/Nestea.idl b/TAO/orbsvcs/tests/ImplRepo/Nestea.idl index 0be9ee1e792..150c1bd52f3 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Nestea.idl +++ b/TAO/orbsvcs/tests/ImplRepo/Nestea.idl @@ -1,5 +1,6 @@ // $Id$ +// Just implements a nice little Nestea server interface Nestea_Bookshelf { void drink (in long cans); diff --git a/TAO/orbsvcs/tests/ImplRepo/Repository.cpp b/TAO/orbsvcs/tests/ImplRepo/Repository.cpp deleted file mode 100644 index 0c243356b0c..00000000000 --- a/TAO/orbsvcs/tests/ImplRepo/Repository.cpp +++ /dev/null @@ -1,208 +0,0 @@ -// $Id$ -#include "Repository.h" - -// Default Constructor -Repository::Repository () -{ - this->repository_.open (ACE_Naming_Context::PROC_LOCAL); -} - -// Add a new server to the Repository -int -Repository::add (const char *key, const char *comm_line, const char *env, const char *wdir) -{ - char *temp; // Temporary string to hold all the variables in. - - // Needs to be as long as all the lengths plus the 2 separators and the - // null character. - ACE_NEW_RETURN (temp, char [ACE_OS::strlen (comm_line) + ACE_OS::strlen (env) - + ACE_OS::strlen (wdir) + 10], -1); - - ACE_OS::sprintf (temp, "%s\n%s\n%s", comm_line, env, wdir); - - // Store the record in the repository. - int retval = this->repository_.bind (key, temp); - - // Clean up and exit. - delete [] temp; - - return retval; -} - -// Removes the server from the Repository -int -Repository::remove (const char *key) -{ - return this->repository_.unbind (key); -} - - -// Find the key record in the Repository -int -Repository::resolve (const char *key, char *&comm_line, char *&env, char *&wdir) -{ - char *value, *type; // Temp variables needed for resolve - char *last, *temp ; // For fields - int retval = this->repository_.resolve (key, value, type); - - // If successful, return what we need. - while (retval == 0) - { - temp = value; - last = ACE_OS::strstr (temp, "\n"); - if (last != 0 && *last == '\n') - { - *last = '\0'; - ACE_NEW_RETURN (comm_line, char [strlen (temp) + 1], -1); - - // Copy to the comm_line argument - strcpy (comm_line, temp); - } - else - { - retval = -1; - break; - } - - temp = last + 1; - last = ACE_OS::strstr (temp, "\n"); - if (last != 0 && *last == '\n') - { - *last = '\0'; - ACE_NEW_RETURN (env, char [strlen (temp) + 1], -1); - - // Copy to the env argument - strcpy (env, temp); - } - else - { - retval = -1; - break; - } - - temp = last + 1; - if (last != 0) - { - ACE_NEW_RETURN (wdir, char [strlen (temp) + 1], -1); - - // Copy to the env argument - strcpy (wdir, temp); - } - else - { - retval = -1; - break; - } - - // Now exit out. - break; - } - - delete [] value; - delete [] type; - return retval; -} -// = Accessor methods - -int -Repository::get_comm_line (const char *key, char *&comm_line) -{ - char *value, *type; // Temp variables needed for resolve - char *last, *temp; // For fields - int retval = this->repository_.resolve (key, value, type); - - // If successful, return what we need. - if (retval == 0) - { - temp = value; - // Null terminate the first field - last = ACE_OS::strstr (value, "\n"); - if (last != 0 && *last == '\n') - { - *last = '\0'; - ACE_NEW_RETURN (comm_line, char [strlen (temp) + 1], -1); - - // Copy to the comm_line argument - strcpy (comm_line, temp); - - delete [] value; - delete [] type; - return 0; - } - else - { - delete [] value; - delete [] type; - return -1; - } - } - - return retval; -} - - -int -Repository::get_env (const char *key, char *&env) -{ - char *value, *type; // Temp variables needed for resolve - char *last, *temp; // For field position - int retval = this->repository_.resolve (key, value, type); - - // If successful, return what we need. - if (retval == 0) - { - last = ACE_OS::strstr (value, "\n"); - temp = last + 1; - last = ACE_OS::strstr (temp, "\n"); - - if (last != 0 && *last == '\n') - { - *last = '\0'; - ACE_NEW_RETURN (env, char [strlen (temp) + 1], -1); - - // Copy to the env argument - strcpy (env, temp); - delete [] value; - delete [] type; - return 0; - } - else - { - delete [] value; - delete [] type; - return -1; - } - } - - return retval; -} - -int -Repository::get_wdir (const char *key, char *&wdir) -{ - char *value, *type; // Temp variables needed for resolve - char *last, *temp ; // For fields - int retval = this->repository_.resolve (key, value, type); - - // If successful, return what we need. - if (retval == 0) - { - last = ACE_OS::strstr (value, "\n"); - last = ACE_OS::strstr (last + 1, "\n"); - temp = last + 1; - - ACE_NEW_RETURN (wdir, char [strlen (temp) + 1], -1); - - // Copy to the wdir argument - strcpy (wdir, temp); - delete [] value; - delete [] type; - } - return retval; -} - -void -Repository::dump (void) -{ - this->repository_.dump (); -} diff --git a/TAO/orbsvcs/tests/ImplRepo/Repository.h b/TAO/orbsvcs/tests/ImplRepo/Repository.h deleted file mode 100644 index aa8467e2d2c..00000000000 --- a/TAO/orbsvcs/tests/ImplRepo/Repository.h +++ /dev/null @@ -1,35 +0,0 @@ -// $Id$ -#if !defined (REPOSITORY_H) -#define REPOSITORY_H - -#include "ace/Naming_Context.h" - -class Repository -{ -public: - Repository (); - // Default Constructor - - int add (const char *key, const char *comm_line, const char *env, const char *wdir); - // Add a new server to the Repository - - int remove (const char *key); - // Removes the server from the Repository - - int resolve (const char *key, char *&comm_line, char *&env, char *&wdir); - // Find the key record in the Repository - - // = Accessor methods - int get_comm_line (const char *key, char *&comm_line); - int get_env (const char *key, char *&env); - int get_wdir (const char *key, char *&wdir); - - // Dump method - void dump (void); - -private: - ACE_Naming_Context repository_; -}; - - -#endif /* REPOSITORY_H */ diff --git a/TAO/orbsvcs/tests/ImplRepo/Repository_Test.cpp b/TAO/orbsvcs/tests/ImplRepo/Repository_Test.cpp index 31f3b2fa3ed..ecf7ec436e8 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Repository_Test.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Repository_Test.cpp @@ -3,13 +3,14 @@ #include "../../ImplRepo_Service/Repository.h" -const char *NAME_VALUE = "server"; -const char *COMM_LINE_VALUE = "server -i"; -const char *ENV_VALUE = "null environment"; -const char *HOST_VALUE = "maxixe.cs.wustl.edu"; +ASYS_TCHAR *NAME_VALUE = ASYS_TEXT ("server"); +ASYS_TCHAR *NAME_VALUE2 = ASYS_TEXT ("server"); +ASYS_TCHAR *COMM_LINE_VALUE = ASYS_TEXT ("server -i"); +ASYS_TCHAR *ENV_VALUE = ASYS_TEXT ("null environment"); +ASYS_TCHAR *HOST_VALUE = ASYS_TEXT ("maxixe.cs.wustl.edu"); const int PORT_VALUE = 20000; -const char *PING_IOR_VALUE = "iiop://maxixe/ping"; -const char *WDIR_VALUE = "."; +ASYS_TCHAR *PING_IOR_VALUE = ASYS_TEXT ("iiop://maxixe/ping"); +ASYS_TCHAR *WDIR_VALUE = ASYS_TEXT ("."); // Just tests the functionality of the Repository @@ -17,7 +18,7 @@ int main (int argc, char *argv[]) { int test_success = 1; Repository rep; - Repository::Record new_rec, rec; + Repository_Record new_rec, rec; new_rec.comm_line = ACE::strnew (COMM_LINE_VALUE); new_rec.env = ACE::strnew (ENV_VALUE); @@ -99,7 +100,7 @@ int main (int argc, char *argv[]) // Try some of the single accessors - char *cl, *env, *ping_ior; + ASYS_TCHAR *cl, *env, *ping_ior; ACE_DEBUG ((LM_DEBUG, "=Performing Single Accessor Test\n")); diff --git a/TAO/orbsvcs/tests/ImplRepo/implrepo.conf b/TAO/orbsvcs/tests/ImplRepo/implrepo.conf index 81b66027c0d..f90601df906 100644 --- a/TAO/orbsvcs/tests/ImplRepo/implrepo.conf +++ b/TAO/orbsvcs/tests/ImplRepo/implrepo.conf @@ -1,5 +1,4 @@ # $Id$ -# -dynamic Resource_Factory Service_Object * TAO:_make_TAO_Default_Resource_Factory() "-ORBresources tss" -dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() -dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection -ORBpoalock null -ORBtablesize 128" +static Resource_Factory "-ORBresources tss" +static Client_Strategy_Factory "" +static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBpoalock null" diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp index 46471c24ce8..4ed1a895e0e 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp @@ -13,30 +13,6 @@ Nestea_Client_i::Nestea_Client_i (void) { } -// Reads the Server factory ior from a file - -int -Nestea_Client_i::read_ior (char *filename) -{ - // Open the file for reading. - ACE_HANDLE f_handle_ = ACE_OS::open (filename, 0); - - if (f_handle_ == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to open %s for writing: %p\n", - filename), - -1); - ACE_Read_Buffer ior_buffer (f_handle_); - this->server_key_ = ior_buffer.read (); - - if (this->server_key_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to allocate memory to read ior: %p\n"), - -1); - - ACE_OS::close (f_handle_); - return 0; -} // Parses the command line arguments and returns an error status. diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h index 5a428183d36..9b23cf6be44 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h @@ -44,9 +44,6 @@ public: // Initialize the client communication endpoint with server. private: - int read_ior (char *filename); - // Function to read the server ior from a file. - int parse_args (void); // Parses the arguments passed on the command line. @@ -66,4 +63,4 @@ private: // Remember our orb. }; -#endif /* Nestea_CLIENT_I_H */ +#endif /* NESTEA_CLIENT_I_H */ diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp index 90a6bab52da..2ed96b25d38 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp @@ -60,7 +60,10 @@ Nestea_i::crush (CORBA::Long cans, if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Nestea_i::crush %d cans\n", cans)); - this->cans_ -= cans; + if (ACE_static_cast (ACE_UINT32, cans) > this->cans_) + this->cans_ = 0; + else + this->cans_ -= cans; if (this->shutdown_ != 0) TAO_ORB_Core_instance ()->orb ()->shutdown (); diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp index b9c2b10e3ea..e5673015ac2 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp @@ -1,7 +1,6 @@ // $Id$ #include "nestea_server_i.h" -//#include "ace/file_connector.h" ACE_RCSID(ImplRepo, nestea_server, "$Id$") diff --git a/TAO/orbsvcs/tests/ImplRepo/svc.conf b/TAO/orbsvcs/tests/ImplRepo/svc.conf index 57a66c1e8ed..d5e0059859d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/svc.conf +++ b/TAO/orbsvcs/tests/ImplRepo/svc.conf @@ -1,5 +1,4 @@ # $Id$ -# static Resource_Factory "-ORBresources global" static Client_Strategy_Factory "" static Server_Strategy_Factory "-ORBconcurrency reactive -ORBtablesize 128" |