diff options
Diffstat (limited to 'TAO/examples')
38 files changed, 3697 insertions, 260 deletions
diff --git a/TAO/examples/Callback_Quoter/Makefile b/TAO/examples/Callback_Quoter/Makefile index 5048ac0fab0..fd4fadda73a 100644 --- a/TAO/examples/Callback_Quoter/Makefile +++ b/TAO/examples/Callback_Quoter/Makefile @@ -237,6 +237,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -247,8 +249,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -384,6 +384,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ConsumerC.h ConsumerC.i NotifierC.i NotifierS.h ConsumerS.h \ ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS_T.h \ NotifierS_T.i NotifierS_T.cpp NotifierS.i @@ -504,6 +508,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -514,8 +520,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -651,6 +655,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \ NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \ NotifierS.i @@ -771,6 +779,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -781,8 +791,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -918,6 +926,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ConsumerC.i ConsumerS.h ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp \ ConsumerS.i .obj/ConsumerS.o .obj/ConsumerS.so .shobj/ConsumerS.o .shobj/ConsumerS.so: ConsumerS.cpp ConsumerS.h ConsumerC.h \ @@ -1037,6 +1049,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1047,8 +1061,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1184,6 +1196,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i .obj/consumer.o .obj/consumer.so .shobj/consumer.o .shobj/consumer.so: consumer.cpp Consumer_Handler.h ConsumerC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -1302,6 +1318,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1312,8 +1330,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1449,6 +1465,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ConsumerC.i NotifierC.h NotifierC.i Consumer_i.h ConsumerS.h \ ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS.h \ NotifierS_T.h NotifierS_T.i NotifierS_T.cpp NotifierS.i \ @@ -1589,6 +1609,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1599,8 +1621,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1736,6 +1756,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -1877,6 +1901,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1887,8 +1913,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2024,6 +2048,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -2160,6 +2188,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -2170,8 +2200,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2307,6 +2335,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -2442,6 +2474,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -2452,8 +2486,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2589,6 +2621,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \ NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \ NotifierS.i \ @@ -2727,6 +2763,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -2737,8 +2775,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2874,6 +2910,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \ NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \ NotifierS.i \ @@ -3013,6 +3053,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -3023,8 +3065,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -3160,6 +3200,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \ NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \ NotifierS.i \ @@ -3281,6 +3325,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -3291,8 +3337,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -3428,6 +3472,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \ NotifierS.h NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i \ NotifierS_T.cpp NotifierS.i @@ -3550,6 +3598,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -3560,8 +3610,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -3697,6 +3745,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ConsumerC.i NotifierC.h NotifierC.i Consumer_i.h ConsumerS.h \ ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS.h \ NotifierS_T.h NotifierS_T.i NotifierS_T.cpp NotifierS.i \ @@ -3838,6 +3890,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -3848,8 +3902,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -3985,6 +4037,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ConsumerC.i NotifierC.h NotifierC.i Consumer_i.h ConsumerS.h \ ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS.h \ NotifierS_T.h NotifierS_T.i NotifierS_T.cpp NotifierS.i \ @@ -4125,6 +4181,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -4135,8 +4193,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -4272,6 +4328,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ConsumerC.i NotifierC.h NotifierC.i Consumer_i.h ConsumerS.h \ ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS.h \ NotifierS_T.h NotifierS_T.i NotifierS_T.cpp NotifierS.i \ diff --git a/TAO/examples/Event_Comm/Makefile b/TAO/examples/Event_Comm/Makefile index 4c6a063a09f..f02b09639d0 100644 --- a/TAO/examples/Event_Comm/Makefile +++ b/TAO/examples/Event_Comm/Makefile @@ -229,6 +229,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -239,8 +241,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -376,6 +376,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \ Event_CommS.i .obj/Event_CommC.o .obj/Event_CommC.so .shobj/Event_CommC.o .shobj/Event_CommC.so: Event_CommC.cpp Event_CommC.h \ @@ -495,6 +499,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -505,8 +511,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -642,6 +646,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Event_CommC.i Event_CommS.h Event_CommS_T.h Event_CommS_T.i \ Event_CommS_T.cpp Event_CommS.i .obj/Consumer_Handler.o .obj/Consumer_Handler.so .shobj/Consumer_Handler.o .shobj/Consumer_Handler.so: Consumer_Handler.cpp Consumer_Handler.h \ @@ -766,6 +774,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -776,8 +786,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -910,6 +918,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \ Event_CommS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ @@ -1050,6 +1062,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1060,8 +1074,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1194,6 +1206,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \ Event_CommS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ @@ -1332,6 +1348,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1342,8 +1360,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1476,6 +1492,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \ Event_CommS.i .obj/Notifier_Handler.o .obj/Notifier_Handler.so .shobj/Notifier_Handler.o .shobj/Notifier_Handler.so: Notifier_Handler.cpp Notifier_Handler.h \ @@ -1603,6 +1623,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1613,8 +1635,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1747,6 +1767,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \ Event_CommS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ @@ -1885,6 +1909,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1895,8 +1921,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2029,6 +2053,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \ Event_CommS.i Notifier_Handler.h \ $(ACE_ROOT)/ace/CORBA_Handler.h \ @@ -2171,6 +2199,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -2181,8 +2211,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2315,6 +2343,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \ Event_CommS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ @@ -2454,6 +2486,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -2464,8 +2498,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2598,6 +2630,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \ Event_CommS.i \ $(TAO_ROOT)/tao/TAO.h \ @@ -2742,6 +2778,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -2752,8 +2790,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2886,6 +2922,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \ Event_CommS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ @@ -3026,6 +3066,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -3036,8 +3078,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -3170,6 +3210,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \ Event_CommS.i \ $(TAO_ROOT)/tao/TAO.h \ diff --git a/TAO/examples/Makefile b/TAO/examples/Makefile index 0e0490bf482..d195ad5816c 100644 --- a/TAO/examples/Makefile +++ b/TAO/examples/Makefile @@ -14,7 +14,8 @@ DIRS = Callback_Quoter \ POA \ Quoter \ Simple \ - Event_Comm + Event_Comm \ + OBV #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/examples/OBV/Makefile b/TAO/examples/OBV/Makefile new file mode 100644 index 00000000000..524e8067824 --- /dev/null +++ b/TAO/examples/OBV/Makefile @@ -0,0 +1,23 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +# Makefile for the TAO/OBV examples +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +DIRS = Typed_Events + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp new file mode 100644 index 00000000000..93ff0c293f3 --- /dev/null +++ b/TAO/examples/OBV/Simple_util.cpp @@ -0,0 +1,351 @@ +//$Id$ + +// This version of Simple_Util doesn't need to link against orbsvcs +// On the other hand it has no naming service. + +#ifndef SIMPLE_UTIL_C +#define SIMPLE_UTIL_C +# include "Simple_util.h" + +// Constructor. + +template <class Servant> +Server<Servant>::Server (void) + : ior_output_file_ (0), + naming_ (0), + ins_ (0) +{ + // no-op. +} + +// Destructor. + +template <class Servant> +Server<Servant>::~Server (void) +{ +} + +// Parse the command-line arguments and set options. + +template <class Servant> int +Server<Servant>::parse_args (void) +{ + ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ni:"); + int c = 0; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'd': // debug flag. + TAO_debug_level++; + break; + case 'o': // output the IOR to a file. + this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w"); + if (this->ior_output_file_ == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to open %s for writing: %p\n", + get_opts.optarg), -1); + break; + + case 'i': // For Testing the InterOperable Naming Service. + this->ins_ = CORBA::string_dup (get_opts.optarg); + break; + case '?': // display help for use of the server. + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s" + " [-d]" + " [-o] <ior_output_file>" + "\n", + argv_ [0]), + -1); + } + + // Indicates successful parsing of command line. + return 0; +} + +// Add the ObjectID:IOR mapping to the IOR table of +// the ORB. Ignore this method if you are not testing for +// the InterOperable Naming Service. + +template <class Servant> int +Server<Servant>::test_for_ins (CORBA::String_var ior) +{ + + CORBA::Object_ptr bank_servant = + this->orb_manager_.orb ()->string_to_object (ior.in()); + + // Add a KEY:IOR mapping to the ORB table. + ACE_CString object_id (this->ins_); + + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Adding (KEY:IOR) %s:%s\n", + object_id.c_str (), + ior.in ())); + + if (this->orb_manager_.orb ()->_tao_add_to_IOR_table (object_id, + bank_servant) != 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Simple_Util : Unable to add IOR to table\n"), + -1); + + return 0; +} + +// Initialize the server. +template <class Servant> int +Server<Servant>::init (const char *servant_name, + int argc, + char *argv[], + CORBA::Environment &ACE_TRY_ENV) +{ + // Call the init of <TAO_ORB_Manager> to initialize the ORB and + // create a child POA under the root POA. + if (this->orb_manager_.init_child_poa (argc, + argv, + "child_poa", + ACE_TRY_ENV) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "init_child_poa"), + -1); + + ACE_CHECK_RETURN (-1); + + this->argc_ = argc; + this->argv_ = argv; + + int retval = this->parse_args (); + + if (retval != 0) + return retval; + + CORBA::ORB_var orb = this->orb_manager_.orb (); + + // Stash our ORB pointer for later reference. + this->servant_.orb (orb.in ()); + + // Activate the servant in its own child POA. + + // Make sure that you check for failures here via the ACE_TRY + // macros?! + ACE_TRY + { + CORBA::String_var str = + this->orb_manager_.activate_under_child_poa (servant_name, + &this->servant_, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + ACE_DEBUG ((LM_DEBUG, + "The IOR is: <%s>\n", + str.in ())); + + if (this->ins_) + if (this->test_for_ins (str) != 0) + ACE_ERROR_RETURN ((LM_ERROR, + "test_for_ins (): failed\n"), + -1); + + if (this->ior_output_file_) + { + ACE_OS::fprintf (this->ior_output_file_, + "%s", + str.in ()); + ACE_OS::fclose (this->ior_output_file_); + } + + } + ACE_CATCHANY + { + ACE_TRY_ENV.print_exception ("\tException in activation of POA"); + return -1; + } + ACE_ENDTRY; + + return 0; +} + +template <class Servant>int +Server<Servant>::run (CORBA::Environment &env) +{ + // Run the main event loop for the ORB. + if (this->orb_manager_.run (env) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + "Server_i::run"), + -1); + + return 0; +} + +template <class Servant> int +Server<Servant>::register_name (void) +{ + return -1; +} + +// Constructor. + +template <class InterfaceObj, class Var> +Client<InterfaceObj, Var>::Client (void) + : ior_ (0) +{ + //no-op +} + +// Reads the Server ior from a file + +template <class InterfaceObj, class Var> int +Client<InterfaceObj, Var>::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); + char *data = ior_buffer.read (); + + if (data == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to read ior: %p\n"), + -1); + + this->ior_ = ACE_OS::strdup (data); + ior_buffer.alloc ()->free (data); + + ACE_OS::close (f_handle); + + return 0; +} + +// Parses the command line arguments and returns an error status. + +template <class InterfaceObj, class Var> int +Client<InterfaceObj, Var>::parse_args (void) +{ + ACE_Get_Opt get_opts (argc_, argv_, "df:nk:x"); + int c = 0; + int result = 0; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'd': // debug flag + TAO_debug_level++; + break; + case 'k': // ior provide on command line + this->ior_ = ACE_OS::strdup (get_opts.optarg); + break; + case 'f': // read the IOR from the file. + result = this->read_ior (get_opts.optarg); + if (result < 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to read ior from %s : %p\n", + get_opts.optarg), + -1); + break; + case 'x': // read the flag for shutting down + this->shutdown_ = 1; + break; + } + + // Indicates successful parsing of command line. + return 0; +} + +template <class InterfaceObj, class Var> +Client<InterfaceObj, Var>::~Client (void) +{ + ACE_OS::free (this->ior_); +} + +template <class InterfaceObj, class Var> int +Client<InterfaceObj, Var>::init (const char *name, + int argc, + char **argv) +{ + this->argc_ = argc; + this->argv_ = argv; + + + ACE_DECLARE_NEW_CORBA_ENV; + + ACE_TRY + { + // Retrieve the ORB. + this->orb_ = CORBA::ORB_init (this->argc_, + this->argv_, + 0, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Parse command line and verify parameters. + if (this->parse_args () == -1) + return -1; + + + + if(this->ior_ != 0) + { + CORBA::Object_var server_object = + this->orb_->string_to_object (this->ior_, ACE_TRY_ENV); + ACE_TRY_CHECK; + + + if (CORBA::is_nil (server_object.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + "invalid ior <%s>\n", + this->ior_), + -1); + this->server_ = InterfaceObj::_narrow (server_object.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + } + else + ACE_ERROR_RETURN ((LM_ERROR, + "no ior or naming options specified\n"), + -1); + + + } + ACE_CATCHANY + { + ACE_TRY_ENV.print_exception ("Client_i::init"); + return -1; + } + ACE_ENDTRY; + + + return 0; +} + + +template <class InterfaceObj, class Var> int +Client<InterfaceObj, Var>::obtain_initial_references (CORBA::Environment &ACE_TRY_ENV) +{ + + return 0; +} + +template <class InterfaceObj, class Var> int +Client<InterfaceObj, Var>::shutdown (void ) +{ + // Returns the shutdwon flag + return shutdown_; +} + +template <class InterfaceObj, class Var> void +Client<InterfaceObj, Var>::shutdown (int flag) +{ + // Fills the flag + shutdown_ = flag; +} + +#endif diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h new file mode 100644 index 00000000000..7620821eff5 --- /dev/null +++ b/TAO/examples/OBV/Simple_util.h @@ -0,0 +1,182 @@ +//$Id$ + +// This version of Simple_Util doesn't need to link against orbsvcs +// On the other hand it has no naming service. + +// ============================================================================ +// +// = LIBRARY +// +// taken from TAO/tests/Simple +// +// = FILENAME +// Simple_Util.h +// +// = DESCRIPTION +// The classe define the templates for the client and server. +// +// = AUTHOR +// Balachandran Natarajan <bala@cs.wustl.edu> +// +// ============================================================================ + +#ifndef TAO_UTIL_H +#define TAO_UTIL_H + +#include "tao/TAO.h" +//#include "orbsvcs/Naming/Naming_Utils.h" +#include "ace/Get_Opt.h" +#include "ace/Read_Buffer.h" + +template <class Servant> +class Server +{ + // = TITLE + // A set of useful class Templates for using the TAO CORBA + // implementation. + // + // = DESCRIPTION + // A template server definition. This template can be used by + // single server/client projects for defintion of their + // server/clients. See the directories time, bank, echo for + // further details of implemenatation. +public: + // = Initialization and termination methods. + + Server (void); + // Constructor. + + ~Server (void); + // Destructor. + + int init (const char *servant_name, + int argc, + char *argv[], + CORBA::Environment &env); + // Initialize the Server state - parsing arguments and waiting. + // interface_name is the name used to register the Servant. + + int register_name (void); + // After calling <init>, this method will register the server with + // the TAO Naming Service using the servant_name passed to <init>. + + int run (CORBA::Environment &env); + // Run the orb. + + int test_for_ins (CORBA::String_var ior); + // Ignore this method if you are not testing the InterOperable + // Naming Service. + +protected: + Servant servant_; + // Servant class + + const char *name; + // name of the servant to be used for TAO Naming Service + + int parse_args (void); + // Parses the commandline arguments. + + TAO_ORB_Manager orb_manager_; + // The ORB manager - a helper class for accessing the POA and + // registering objects. + + // TAO_Naming_Server namingServer; + // helper class for getting access to Naming Service. + + FILE *ior_output_file_; + // File where the IOR of the server object is stored. + + int naming_; + // Flag to indicate whether naming service could be used + + char * ins_; + // Used test the INS. + + int argc_; + // Number of command line arguments. + + char **argv_; + // The command line arguments. +}; + +template <class InterfaceObj, class Var> +class Client +{ + // = TITLE + // Template Client class + // + // = DESCRIPTION + // A template client implementation for a single server/client + // model. The example usage of these usage can be found in the + // sub-directories below +public: + + // = Initialization and termination methods. + Client (void); + // Constructor. + + ~Client (void); + // Destructor. + + int init (const char *name,int argc, char *argv[]); + // Initialize the client communication endpoint with server. + + InterfaceObj *operator-> () { return server_.in ();}; + // Return the interface object pointer. + + int shutdown (void ); + // Returns the shutdown flag. + + void shutdown (int); + // Fills in the shutdwon flag. + + int obtain_initial_references (CORBA::Environment &); + // Initialize naming service + +protected: + 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. + +// TAO_Naming_Client namingClient; + // helper class for getting access to Naming Service. + + int argc_; + // # of arguments on the command line. + + char **argv_; + // arguments from command line. + + char *ior_; + // IOR of the obj ref of the server. + + char *name_; + // Name to be usred for the naming service + + CORBA::Environment env_; + // Environment variable. + + Var server_; + // Server object + + int naming_; + // Flag to use the naming service + + int shutdown_; + // Flag for shutting down the server + + CORBA::ORB_var orb_; + // Remember our orb. +}; + +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#include "Simple_util.cpp" +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) +#pragma implementation "Simple_util.cpp" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ + +#endif /* TAO_UTIL_H */ diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp new file mode 100644 index 00000000000..45eed87883d --- /dev/null +++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp @@ -0,0 +1,124 @@ +//$Id$ + +#include "Client_i.h" +#include "Event_Types_impl.h" +#include "ace/Get_Opt.h" + + +int +Checkpoint_Client_i::run (char *name, + int argc, + char *argv[]) +{ + // Initialize the client (read ior...). + if (checkpoint.init (name,argc, argv) == -1) + return -1; + + // Set random seed + ACE_Time_Value now (ACE_OS::gettimeofday ()); + ACE_OS::srand ((unsigned int) now.sec () ); + + ACE_DECLARE_NEW_CORBA_ENV; + + ACE_TRY + { + // Make factories to unmarshal OBV, when getting back a list + // of events which raised an alarm condition. + + // TAO_OBV_REGISTER_FACTORY (Event_factory); + // This one not (see header file) + + TAO_OBV_REGISTER_FACTORY (Temperature_factory); + TAO_OBV_REGISTER_FACTORY (Position_factory); + TAO_OBV_REGISTER_FACTORY (Log_Msg_factory); + TAO_OBV_REGISTER_FACTORY (Event_List_factory); + TAO_OBV_REGISTER_FACTORY (Event_List_Link_factory); + + ACE_DEBUG ((LM_DEBUG, "Send some random events:\n")); + + double temperature = random_number (29,34); + Temperature_var t_e (new Temperature_impl (temperature)); + t_e->origin_id_ (KITCHEN); + t_e->do_print (); + checkpoint->put_event (t_e, ACE_TRY_ENV); + ACE_TRY_CHECK; + + temperature = random_number (25,30); + t_e = new Temperature_impl (temperature); + t_e->origin_id_ (BATHROOM); + t_e->do_print (); + checkpoint->put_event (t_e, ACE_TRY_ENV); + ACE_TRY_CHECK; + + Point point = { random_number (0,4), + random_number (0,4), + random_number (0,4) }; + Position_var p_e (new Position_impl (point)); + p_e->origin_id_ (JONAS); + p_e->do_print (); + checkpoint->put_event (p_e, ACE_TRY_ENV); + ACE_TRY_CHECK; + + + int urgent = (random_number (0,2) > 1) ? 1 : 0; + const char *a_text = (random_number (0,2) > 1) ? "Coffee is cold." + : "I want pasta."; + Log_Msg_var l_e (new Log_Msg_impl (urgent, a_text)); + l_e->origin_id_ (JONAS); + l_e->do_print (); + checkpoint->put_event (l_e, ACE_TRY_ENV); + ACE_TRY_CHECK; + + + ACE_DEBUG ((LM_DEBUG, "\nNow getting the alarms:\n")); + + Event_List_var list (checkpoint->get_critical_events (ACE_TRY_ENV)); + ACE_TRY_CHECK; + + for (Event_List_Iterator i (list); i.next (); i.advance ()) + { + i.next ()-> do_print (); + } + + if (checkpoint.shutdown () == 1) + checkpoint->shutdown (ACE_TRY_ENV); + + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"\n Exception in RMI"); + return -1; + } + ACE_ENDTRY; + ACE_CHECK_RETURN (-1); + + return 0; +} + +// Constructor. +Checkpoint_Client_i::Checkpoint_Client_i (void) +{ + //no-op +} + +//Destructor. +Checkpoint_Client_i::~Checkpoint_Client_i (void) +{ + //no-op +} + + +// A random number in the range of min to max. +double random_number (double min, double max) +{ + double range = max - min; + return (min + (range * ACE_OS::rand () / (RAND_MAX + 1.0))); +} + + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +template class Client<Checkpoint,Checkpoint_var>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate Client<Checkpoint,Checkpoint_var> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/OBV/Typed_Events/Client_i.h b/TAO/examples/OBV/Typed_Events/Client_i.h new file mode 100644 index 00000000000..222c1ff5708 --- /dev/null +++ b/TAO/examples/OBV/Typed_Events/Client_i.h @@ -0,0 +1,58 @@ +// -*- C++ -*- +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// TAO/examples/OBV/Typed_Events +// +// = FILENAME +// Client_i.h +// +// = DESCRIPTION +// This class is a template for a CORBA client. +// run () sends some valuetypes to a server and +// gets back a list of valuetypes. +// +// = AUTHOR +// +// Torsten Kuepper +// based on the echo example +// from code from Balachandran Natarajan <bala@cs.wustl.edu> +// +// ============================================================================ + +#ifndef ECHO_CLIENT_I_H +#define ECHO_CLIENT_I_H + +#include "../Simple_util.h" +#include "Event_TypesC.h" + +double random_number (double min, double max); + +class Checkpoint_Client_i +{ + // = TITLE + // Checkpoint_Client interface subclass. + // + // = DESCRIPTION + // This class implements the interface between the interface + // objects and the client . +public: + // = Initialization and termination methods. + Checkpoint_Client_i (void); + // Constructor + + virtual ~Checkpoint_Client_i (void); + // Destructor + + virtual int run (char *,int, char** ); + // Execute the methods + +private: + Client<Checkpoint, Checkpoint_var> checkpoint; + // Instantiate the checkpoint object. +}; + + +#endif /* TIME_CLIENT_I_H */ diff --git a/TAO/examples/OBV/Typed_Events/Event_Types.idl b/TAO/examples/OBV/Typed_Events/Event_Types.idl new file mode 100644 index 00000000000..40c167d1250 --- /dev/null +++ b/TAO/examples/OBV/Typed_Events/Event_Types.idl @@ -0,0 +1,245 @@ +// Event_Types.idl +// Simple demonstration of typed events in a distributed system. +// +// Author: +// Torsten Kuepper +// + +// $Id$ + +// Event inheritance hierarchy =========================== + +// Base class -------------------------------------------- + +valuetype Event +{ + void do_print (); + + // An operation. In some implementations (e.g. operator terminal) + // the event should visualize itself. That is of no use at the + // event producing sensor. So, the declaration of do_print () + // could be deferred to the implementation classes, but then you need + // to downcast from the pointer to the event valuetype to your + // implementation. Another solution is perhaps to inherit do_print () + // through an additional abstract valuetype base only in that + // IDL that a visualizing implementation sees. But this would change + // the type and this is a bad thing. The cleanest thing to do may be + // to apply the visitor pattern. Event::accept (visitor) would be + // implemented as null-op in the measurement device, if you take this + // example. + + + public long time_; + + // A state member. Don't confuse with attributes, which are + // ok here too, but they do only map to a pair of local operations, + // in opposite to (public/private) state members they haven't got no + // implementation for the state data and finally they are not transmitted + // over the wire. + + + public unsigned long origin_id_; + + // This id should identify the origin (e.g. sensor) in the system. + // This makes an id-space beside the object references which has to be + // maintained. It would be useful to implement some consistency check + // protocol (as CORBA interfaces) to verify that the suppliers and + // consumers are connected (through some event channel) in the + // right way. + +}; + + +// Derived Events ---------------------------------------- + + +valuetype Temperature : Event +{ + // do_print () is overridden in the implementation. We can't + // tell this in IDL, because operations can't be declared again. + // They are implicit assumed to be polymorph. + + public float temperature_; + // Extends Event with the state member for the temperature. +}; + + +typedef float Point[3]; +// (anonymous arrays are not yet working in this OBV ...%!) +// (( BTW %! <- no emoticon, this is my to do mark)) + +valuetype Position : Event +{ + attribute float x, y, z; + // The Position can be accessed both through the coordinates ... + + public Point xyz; + // ... or as a whole array, which is a state member. +}; + + +valuetype Log_Msg : Event +{ + public short urgency; + public string message; +}; + +// (Valuetypes which hold other types as shown are not yet tested %!) + +// You may extend the system with aggregated events, such the status +// message of a boiler, which has temperature and a pressure valuetype +// as state member (recall: unshared valuetypes are well at this time. +// But a shared valuetype splits at the receiving end of an invocation +// in two or more instances, dependend on the number of references on it +// (in the argument list plus in the members of compound types). This +// misbehaviour will go away once valuetype sharing is implemented %! +// But to do this in an efficient and thread safe manner seems a little tricky) + + +// Passing back the critical events in a list ---------------------------- + +// This is the link, that is used internally ----- +// (should come after Event_List, but forward decl. is not yet complete %!) + +valuetype Event_List_Link +{ + Event get_event (); + // get the event + + Event_List_Link get_next_link (); + // get the event + + void attach_next_link (in Event_List_Link chain); + // Link a chain at the end. + + private Event my_event; + // event which is held + + private Event_List_Link next; + // link to the next event container +}; + +// 'private' state member are mapped to 'protected' in C++, so +// they can be accessed from the implementation class, which should +// be derived from OBV_Event_chain. + + +// The event list uses links as declared above. But its implementation +// could be changed 'under the hood' to use e.g. a CORBA sequence. +// (This doesn't go yet, because valuetype is only allowed +// as an operation argument for now. Just impl. the visitors in tao_idl %!) + +valuetype Event_List +{ + void store_event (in Event e); + // Attach an event at the lists's end. + + public Event_List_Link first_link; + // Should better be private, but then the iterator can't access it. +}; + + +// Interface to access the "event server" ------------------ + +// A client (e.g. sensor) delivers the events via put_event (). +// The server checks against alarm conditions and memorizes +// critical events, which can be passed back +// to a client (e.g. operator terminal) with get_critical_events (). + +interface Checkpoint +{ + void put_event (in Event e); + // Put event in the server. If it exceeds an alarm criterion + // it will be stored. + + Event_List get_critical_events (); + // Ask for a list of critical events. + + oneway void shutdown (); + // This operation will shutdown the server. +}; + + +// Checkpoint server side -------------------------------------------- +// The Checkpoint should compare the incoming event against a +// criterion for the specific event type. My approach is the following +// (to facilitate separation of application logic and event specific +// code): An abstract valuetype Criterion provides is_critical () to check +// against a boundary. Concrete alarm boundaries for any existing +// event derive from this class and perform the check. Thats's it for +// the event type maintainer --- the customs that use this 'framework'. + +// The concrete criterions inherit from Event too. I wanted to reuse +// the list which works on events. The wrapper Criterion_List makes it safe +// that only criterions are accepted to this list. Templates would be fine, +// but currently I have no idea how to apply them to a valuetype. Perhaps +// there is no way to get around custom marshalling [n.y.avail.%!] in the +// area of containers. +// Finally the concrete criterions must have a suitable implementation for +// is_critical (). + +// Now the internals of the server which shouldn't need to be touched by +// the final implementer: The above mentioned wrapper Criterion_List +// uses an Event_List to compare an incoming event against the +// boundaries. In this simple example it will just apply the event to +// is_critical () of any criterion, which origin id matches. +// The criterion checks with +// valuetype's _downcast () if the event matches its event type and then +// performs the alarm check. A real world approach with many event types +// and criterions could better use a hash map for the criterions. The +// external map index would be the repository id of the event. + +abstract valuetype Criterion +{ + boolean is_critical (in Event e); + // Check against alarm boundaries. +}; + + +// The specialized criterions. Note: A valuetype can only inherit +// from one non-abstract other valuetype (which then must be the first +// one listed). Further Criterions may only be abstract valuetypes +// without the ability to contain state members. (The support of +// a CORBA interface is not yet supported.) +// P.S. Please don't bother about the class hierarchy +// (Criterion inherits from Event _and_ has some Events as boundary values +// aggregated). I just wanted to reuse the code for the list of events. +// Certainly not an example of good OO design. + + +valuetype Temperature_Criterion : Event, Criterion +{ + private Temperature meltingpoint; + // The boundary is stored in a state member. +}; + + +valuetype Position_Criterion : Event, Criterion +{ + private Position leftbottom, topright; + // Any position should be contained in a box. +}; + + +valuetype Log_Msg_Criterion : Event, Criterion +{ + // No state member. All Log_Msg which have urgency + // greater zero meet the criterion. +}; + + + +// The Criterion_List =========================================== + +valuetype Criterion_List +{ + void store_criterion (in Criterion c); + // Attach an criterion at the lists's end. + + boolean is_critical (in Event e); + // Check with the listmembers if e should raise an alarm. + + public Event_List my_list; + // Used in the implementation. Is public for allowing + // access to the iterator. +}; diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp new file mode 100644 index 00000000000..0ded41de8ed --- /dev/null +++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp @@ -0,0 +1,595 @@ +// $Id$ + +#include "Event_Types_impl.h" + +// Implementation of the valuetype member functions. + +Event_impl::Event_impl () + // initializers (': foo ()') don't work for OBV state members + // since we should only access the state through modifier functions +{ + // Put a timestamp on event's birth. + ACE_Time_Value now (ACE_OS::gettimeofday ()); + this->time_ (now.sec ()); +} + +Event_impl::~Event_impl () +{ +} + +void +Event_impl::do_print (void) +{ + ACE_DEBUG((LM_DEBUG, "(time %d origin %d) ", + (CORBA::ULong) this->time_(), (CORBA::ULong) this->origin_id_() )); +} + + +/* Not defined, see header +Event_factory::~Event_factory () +{ +} + +TAO_OBV_CREATE_RETURN_TYPE (Event) +Event_factory::create_for_unmarshal () +{ + return new Event_impl; +} +*/ + +// Temperature implementation =================================== + +Temperature_impl::Temperature_impl () +{ +} + +Temperature_impl::Temperature_impl (CORBA::Float temp) +{ + this->temperature_ (temp); +} + +Temperature_impl::~Temperature_impl () +{ +} + +void +Temperature_impl::do_print (void) +{ + Event_impl::do_print (); + // The timestamp + + ACE_DEBUG((LM_DEBUG, "Temperature is %f\n", this->temperature_() )); +} + +Temperature_factory::~Temperature_factory () +{ +} + +TAO_OBV_CREATE_RETURN_TYPE (Temperature) +Temperature_factory::create_for_unmarshal () +{ + return new Temperature_impl; +} + + +// Position implementation ====================================== + +Position_impl::Position_impl () +{ +} + +Position_impl::Position_impl (Point &p) +{ + this->xyz (p); + // Does a copy of the p array +} + +Position_impl::~Position_impl () +{ +} + +void +Position_impl::do_print (void) +{ + Event_impl::do_print (); + // The timestamp + + ACE_DEBUG((LM_DEBUG, "Position is (%f, %f, %f)\n", + this->x(), this->y(), this->z() )); +} + +CORBA::Float Position_impl::x () { return this->xyz()[0]; } +void Position_impl::x (CORBA::Float x) { this->xyz()[0] = x; } +CORBA::Float Position_impl::y () { return this->xyz()[1]; } +void Position_impl::y (CORBA::Float y) { this->xyz()[1] = y; } +CORBA::Float Position_impl::z () { return this->xyz()[2]; } +void Position_impl::z (CORBA::Float z) { this->xyz()[2] = z; } + + +Position_factory::~Position_factory () +{ +} + +TAO_OBV_CREATE_RETURN_TYPE (Position) +Position_factory::create_for_unmarshal () +{ + return new Position_impl; +} + + +// Log_Msg implementation =================================== + +Log_Msg_impl::Log_Msg_impl () +{ +} + +Log_Msg_impl::Log_Msg_impl (CORBA::Short u, const char *m) +{ + this->urgency (u); + this->message (CORBA::string_dup (m)); +} + +Log_Msg_impl::~Log_Msg_impl () +{ +} + +void +Log_Msg_impl::do_print (void) +{ + Event_impl::do_print (); + // The timestamp + + if (this->urgency () > 0) + { + ACE_DEBUG((LM_DEBUG, "**** %s ****\n", this->message () )); + } + else + { + ACE_DEBUG((LM_DEBUG, "%s\n", this->message () )); + } +} + +Log_Msg_factory::~Log_Msg_factory () +{ +} + +TAO_OBV_CREATE_RETURN_TYPE (Log_Msg) +Log_Msg_factory::create_for_unmarshal () +{ + return new Log_Msg_impl; +} + + + +// Event_List_Link implementation =================================== + +Event_List_Link_impl::Event_List_Link_impl () +{ + this->my_event (0); + this->next (0); +} + +Event_List_Link_impl::Event_List_Link_impl (Event* e) +{ + this->my_event (e); + // Note that the modifier increases the reference counter of e. + + this->next (0); +} + +Event_List_Link_impl::~Event_List_Link_impl () +{ + // Destructor does nothing explicit, because my_event and next are + // _var types, which destroy (decrement the reference counter of) + // the held event resp. the next links. +} + +Event* +Event_List_Link_impl::get_event (void) +{ + return this->my_event (); +} + +Event_List_Link* +Event_List_Link_impl::get_next_link (void) +{ + return this->next (); +} + +void +Event_List_Link_impl::attach_next_link (Event_List_Link *n) +{ + this->next (n); +} + +Event_List_Link_factory::~Event_List_Link_factory () +{ +} + +TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link) +Event_List_Link_factory::create_for_unmarshal () +{ + return new Event_List_Link_impl; +} + + +// Event_List implementation =================================== + +Event_List_impl::Event_List_impl () +{ + this->first_link (0); + last_link_cache_ = 0; +} + +Event_List_impl::~Event_List_impl () +{ + // Destructor does nothing explicit, because the _var types do care. +} + +void +Event_List_impl::store_event (Event* e) +{ + // This operation should perform atomically and should + // guard against the access to the list from another thread. + // But this is omitted in this example. + + Event_List_Link_var new_link (new Event_List_Link_impl (e)); + + // We need a new link to store the reference to the event e. + // But if we'd had assigned the newly created instance directly through + // a modifier function to a valuetype member, it would never be released. + // From pointer to _var the reference count of the pointed to never + // increased, but the modifier does. + + + if (last_link_cache_ == 0) + { + // Search the end. + for (Event_List_Link *i = this->first_link (); + i != 0; + i = i->get_next_link ()) + { + last_link_cache_ = i; + } + } + + + // If still null then the list is empty. + if (last_link_cache_ == 0) + { + this->first_link (new_link); + } + else + { + last_link_cache_->attach_next_link (new_link); + last_link_cache_ = new_link; + } +} + +Event_List_factory::~Event_List_factory () +{ +} + +TAO_OBV_CREATE_RETURN_TYPE (Event_List) +Event_List_factory::create_for_unmarshal () +{ + return new Event_List_impl; +} + + +Event_List_Iterator::Event_List_Iterator (Event_List *list) +{ + this->init (list); +} + +Event_List_Iterator::Event_List_Iterator () +{ + // current_ is a _var and set itself to null. +} + +Event_List_Iterator::~Event_List_Iterator () +{ + // nothing +} + + +void +Event_List_Iterator::init (Event_List *list) +{ + Event_List_Link *tmp = list->first_link (); + CORBA::add_ref (tmp); + current_ = tmp; +} + + +CORBA::Boolean +Event_List_Iterator::next (Event_var &next) +{ + if (current_) + { + Event *e = current_->get_event (); + CORBA::add_ref (e); + next = e; + return 1; + } + else + { + return 0; + } +} + +Event * +Event_List_Iterator::next () +{ + if (current_) + { + return current_->get_event (); + } + return 0; +} + +void +Event_List_Iterator::advance () +{ + if (current_) + { + Event_List_Link *tmp = current_->get_next_link (); + CORBA::add_ref (tmp); + current_ = tmp; + } +} + + + +// Checkpoint server side -------------------------------------------- + + +// Criterion classes implementation ---------------------------------- + + + +Temperature_Criterion_impl::Temperature_Criterion_impl () +{ +} + +Temperature_Criterion_impl:: +Temperature_Criterion_impl (CORBA::ULong origin_id, CORBA::Float temp) +{ + this->origin_id_ (origin_id); + Temperature_var tmp (new Temperature_impl (temp)); + this->meltingpoint (tmp.in ()); +} + +Temperature_Criterion_impl::~Temperature_Criterion_impl () +{ +} + + +CORBA::Boolean +Temperature_Criterion_impl::is_critical (Event* e) +{ + // Downcast to a temperature. + Temperature* t = Temperature::_downcast (e); + // Is Event really a Temperature ? + if (t) + { + // Now return the comparison with the meltingpoint. + return + (t->temperature_ () > this->meltingpoint ()->temperature_ ()) ? + 1 : 0; + } + return 0; +} + + +void +Temperature_Criterion_impl::do_print (void) +{ + ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is\n", + this->origin_id_ () )); + this->meltingpoint ()->do_print(); +} + + +Temperature_Criterion_factory::~Temperature_Criterion_factory () +{ +} + +TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) +Temperature_Criterion_factory::create_for_unmarshal () +{ + return new Temperature_Criterion_impl; +} + + + +Position_Criterion_impl::Position_Criterion_impl () +{ +} + +Position_Criterion_impl::Position_Criterion_impl (CORBA::ULong origin_id, + Position *lb, + Position *tr) +{ + this->origin_id_ (origin_id); + this->leftbottom(lb); + this->topright(tr); +} + +Position_Criterion_impl::~Position_Criterion_impl () +{ +} + + +CORBA::Boolean +Position_Criterion_impl::is_critical (Event* e) +{ + Position* p = Position::_downcast (e); + // Is Event really a Position ? + if (p) + { + // If the position of p is out of the box return true. + return ( + (p->x () > this->leftbottom ()->x ()) && + (p->y () > this->leftbottom ()->y ()) && + (p->z () > this->leftbottom ()->z ()) && + (p->x () < this->topright ()->x ()) && + (p->y () < this->topright ()->y ()) && + (p->z () < this->topright ()->z ()) + ) ? 0 : 1; + } + return 0; +} + + +void +Position_Criterion_impl::do_print (void) +{ + ACE_DEBUG((LM_DEBUG, + "Alarm boundary for events with origin id %d is the box\n", + this->origin_id_ () )); + this->leftbottom ()->do_print(); + this->topright ()->do_print(); +} + +Position_Criterion_factory::~Position_Criterion_factory () +{ +} + +TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion) +Position_Criterion_factory::create_for_unmarshal () +{ + return new Position_Criterion_impl; +} + + + +Log_Msg_Criterion_impl::Log_Msg_Criterion_impl () +{ +} + + +Log_Msg_Criterion_impl::~Log_Msg_Criterion_impl () +{ +} + + +CORBA::Boolean +Log_Msg_Criterion_impl::is_critical (Event* e) +{ + Log_Msg* lm = Log_Msg::_downcast (e); + + // Is Event really a Log_Msg ? + if (lm) + { + return (lm->urgency () ? 1 : 0); + } + return 0; +} + + +void +Log_Msg_Criterion_impl::do_print (void) +{ + ACE_DEBUG((LM_DEBUG, + "All log messages with urgency greater zero are registered.\n" )); +} + +Log_Msg_Criterion_factory::~Log_Msg_Criterion_factory () +{ +} + +TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion) +Log_Msg_Criterion_factory::create_for_unmarshal () +{ + return new Log_Msg_Criterion_impl; +} + + + +Criterion_List_impl::Criterion_List_impl () +{ + this->my_list (0); + // We don't want create our list member here, because this constructor + // is called before unmarshalling too. We cant't distinguish that. + // If we transmit this type eventually. This is not done in this example. + // (That is no weakness of OBV since the instance should be created and + // initialized through the factory create (), + // which is not yet implemented %!) +} + +Criterion_List_impl::~Criterion_List_impl () +{ +} + +void +Criterion_List_impl::store_criterion (Criterion *c) +{ + if (!my_list ()) + { + Event_List_var ev(new Event_List_impl); + my_list (ev); + } + + Event *e = Event::_downcast (c); + my_list ()->store_event (e); +} + +CORBA::Boolean +Criterion_List_impl::is_critical (Event *e) +{ + // Try all criterions. Walking the list is efficient enough for + // demonstration. + + for (Criterion_List_Iterator i (this); i.next (); i.advance ()) + { + Criterion *c = i.next (); + + // Let e_c point to the Event part of the Criterion. + // We know that c has an Event part. + Event *e_c = Event::_downcast (c); + + + // A criterion is applied if the origin id is matching the event. + // A null id flags that it should be applied to all events. + + if (e->origin_id_() == e_c->origin_id_ () || + e_c->origin_id_ () == 0) + { + if (c->is_critical (e)) + return 1; + } + } + return 0; +} + + +Criterion_List_Iterator::Criterion_List_Iterator (Criterion_List *list) +{ + this->init (list); +} + +Criterion_List_Iterator::~Criterion_List_Iterator () +{ + // nothing +} + + +void +Criterion_List_Iterator::init (Criterion_List *list) +{ + iterator_.init (list->my_list()); +} + + +Criterion * +Criterion_List_Iterator::next () +{ + return (Criterion::_downcast (iterator_.next ())); +} + +void +Criterion_List_Iterator::advance () +{ + return (iterator_.advance ()); +} diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h new file mode 100644 index 00000000000..7ec51fb8ac3 --- /dev/null +++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h @@ -0,0 +1,415 @@ +// -*- C++ -*- +// $Id$ + +#include "Event_TypesC.h" + +// Event hierarchy implementation classes ====================== + +// The implementation of a valuetype in C++ needs to derive from +// the IDL generated OBV_Event, which provides the data members +// and their accessor/modifier. +// In TAO it is possible to have inline instead the standard virtual +// accessor/modifier functions. But then they can't be overridden for +// marshalling. (doesn't yet work anyway but will come soon %!). +// +// The 'client' of a valuetype (client means here the parts +// of an application which locally access the valuetype through its interface) +// uses pointer to the 'Event' class, or better the Event_var type +// which is similar an object reference _var. +// +// Specs say that the instances of Event_impl should be created by means +// of Event_init::create (), which are equivalents to the init () operations +// in the IDL of the valuetype --- its not yet impl. and will come later on %! +// Today you have to declare your own create () member. +// +// One more step to make (far way from Event to Event_impl, isn't it?): +// We must mix in a class to have a reference counter implementation +// (: Sit down and type twenty times CORBA::DefaultValueRefCountBase :) +// A plus is its on your hand to choose possibly a reference counter +// with (like the standard supplied one) or without lock. But I hate +// the fact that reference counting is based on virtual _add_ref ()/ +// _remove_ref () functions, which may cause substantial overhead. +// I'm thinking of a TAO option to let tao_idl mix in the reference counter +// previous and generate _var classes which access inline functions. +// ... And I wonder how the OMG want to manage cyclic graphs with +// reference counting. + +class Event_impl : public virtual OBV_Event, + public virtual CORBA::DefaultValueRefCountBase +{ + public: + Event_impl (); + virtual ~Event_impl (); + + virtual void do_print (void); + // Implementation of the do_print () operation the valuetype should have. + // All operations in valuetypes are virtual. + + // The state member for the event time is yet implemented in OBV_Event + // (or in the Event class, if -Wb,obv_opt_accessor is given to tao_idl). +}; + +// An instance of the Event_factory class has to be registered +// in the ORB with ORB::register_value_factory (). + +// Then the unmarshal engine can obtain a fresh instance of Event_impl +// from the (user implemented) Event_factory::create_for_unmarshal () +// function. These should return a pointer to Event, but as long as +// covariant return types are not commonly supported one has to +// return a pointer to CORBA::ValueBase. This option handles the macro +// in front of the create_for_unmarshal () declaration. Now the code +// is compiler portable, but not ORB vendor portable ... + +// ... but stop a moment. We don't want an instance of Event. +// It is only the base class for Temperature, Position and Log_Msg. +// We didn't declared Event as abstract valuetype, cause we want to +// store the timestamp in it. So we express that no instance can +// exists while we don't make a factory for it (and don't register one). + +#ifdef is_certainly_not_defined +class Event_factory : public Event_init +{ + public: + + // create (...) would go here +private: + virtual ~Event_factory (); + TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (); +}; +#endif /* is not defined */ + + +// The procedure to register your instance is currently not much like +// OBV specs says. This implementation has currently one +// process-wide map for the registered factories. The specs want one +// per ORB. To run first OBV tests, and that is what we do yet, it is +// more practicable to have simply just one map. (%!) +// Further on it is non-standard how the repository id of the valuetype +// is obtained. Look at the macro TAO_OBV_REGISTER_FACTORY(your_factory_type) +// in tao/ValueFactory.h (explained there) how it is done or just use it +// for first experiments. +// Exceptions are not yet implemented in this area. + + +// Temperature implementation classes =================================== + +// The Temperature_impl should inherit its own OBV_Temperature and +// the implementation of Event. (so-called ladder style implementation +// inheritance, I guess.) Its yet there, but purists +// can additionally inherit public virtual from the CORBA::DefaultVal... + + +class Temperature_impl : public virtual OBV_Temperature, + public virtual Event_impl +{ +public: + Temperature_impl (); + // Constructor for the factory + + Temperature_impl (CORBA::Float temp); + // Constructor, should regularly be a factory create () method. + // But it is more simple to do so here. + + virtual ~Temperature_impl (); + + virtual void do_print (void); + // Overrides Event_impl::do_print (). Note that a new declaration + // in IDL in a derived class is not allowed. +}; + +class Temperature_factory : public Temperature_init +{ + friend Temperature; + public: + // create (...) would go here +private: + virtual ~Temperature_factory (); + TAO_OBV_CREATE_RETURN_TYPE (Temperature) create_for_unmarshal (); +}; + + +// Position implementation classes ===================================== + +class Position_impl : public virtual OBV_Position, + public virtual Event_impl +{ +public: + Position_impl (); + Position_impl (Point &p); + virtual ~Position_impl (); + + virtual CORBA::Float x (); + virtual void x (CORBA::Float); + virtual CORBA::Float y (); + virtual void y (CORBA::Float); + virtual CORBA::Float z (); + virtual void z (CORBA::Float); + //These are the attributes + + virtual void do_print (void); +}; + +class Position_factory : public Position_init +{ + friend Position; + public: + + // create (...) would go here +private: + virtual ~Position_factory (); + TAO_OBV_CREATE_RETURN_TYPE (Position) create_for_unmarshal (); +}; + + +// Log_Msg implementation classes ===================================== + +class Log_Msg_impl : public virtual OBV_Log_Msg, + public virtual Event_impl +{ +public: + Log_Msg_impl (); + Log_Msg_impl (CORBA::Short urgency_p, const char *message_p); + virtual ~Log_Msg_impl (); + + virtual void do_print (void); +}; + +class Log_Msg_factory : public Log_Msg_init +{ + friend Log_Msg; + public: + + // create (...) would go here +private: + virtual ~Log_Msg_factory (); + TAO_OBV_CREATE_RETURN_TYPE (Log_Msg) create_for_unmarshal (); +}; + + +// Event_List_Link implementation classes ===================================== + +class Event_List_Link_factory; +class Event_List_Iterator; + +class Event_List_Link_impl : public virtual OBV_Event_List_Link, + public virtual CORBA::DefaultValueRefCountBase +{ + friend class Event_List_Link_factory; + friend class Event_List; + friend class Event_List_Iterator; + + public: + Event_List_Link_impl (); + Event_List_Link_impl (Event *e); + virtual ~Event_List_Link_impl (); + + Event *get_event (void); + + private: + Event_List_Link *get_next_link (void); + + void attach_next_link (Event_List_Link * chain); + // Attach a chain at the end. +}; + + +class Event_List_Link_factory : public Event_List_Link_init +{ + friend Event_List_Link; + private: + virtual ~Event_List_Link_factory (); + TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link) create_for_unmarshal (); +}; + + +// The event list itself. ---------------------------------- + +class Event_List_impl : public virtual OBV_Event_List, + public virtual CORBA::DefaultValueRefCountBase +{ + friend Event_List_Iterator; + public: + Event_List_impl (); + virtual ~Event_List_impl (); + + void store_event (Event* e); + + Event_List_Link *get_first_link(); + // The iterator needs it. + + private: + Event_List_Link *last_link_cache_; + // For fast attachment. Need not to be a _var cause we hold at least one + // reference through my_first_event_list_link which is a state member and + // is mapped to a _var. + + // And it isn't a state member of valuetype. + // Currently we can't yet do this, because sharing of valuetypes is not + // yet impl ...%!. + // Without the availability to share we would get two different instances + // of the last list link at the receiving end of an invocation. +}; + + +class Event_List_factory : public Event_List_init +{ + friend Event_List; + private: + virtual ~Event_List_factory (); + TAO_OBV_CREATE_RETURN_TYPE (Event_List) create_for_unmarshal (); +}; + + +class Event_List_Iterator +{ + public: + Event_List_Iterator (void); + Event_List_Iterator (Event_List *list); + // Construct it to point to the first list link. + + virtual ~Event_List_Iterator (); + + void init (Event_List *list); + + Event *next (); + // Get pointer to the current event. + + CORBA::Boolean next (Event_var &event); + // Sets the Event_var argument to the current event. + // This forces proper memory management in the user code, as the Event_var + // could be stored beyond the life time of the iterator. + + void advance (); + // Walks one event ahead. + + private: + Event_List_Link_var current_; +}; + + +// Checkpoint server side -------------------------------------------- + + +// Criterion classes ------------------------------------------------- + + +// Criterion itself has no implementation since it is abstract. + +// It is necessary to inherit from OBV_Event (or an Event implementation) +// for implementing the state members of Event. + + +class Temperature_Criterion_impl : + public virtual OBV_Temperature_Criterion, + public virtual OBV_Event, + public virtual CORBA::DefaultValueRefCountBase +{ +public: + Temperature_Criterion_impl (); + Temperature_Criterion_impl (CORBA::ULong origin_id, CORBA::Float temp); + + virtual ~Temperature_Criterion_impl (); + + CORBA::Boolean is_critical (Event* e); + virtual void do_print (void); +}; + +class Temperature_Criterion_factory : public Temperature_Criterion_init +{ + friend Temperature; +private: + virtual ~Temperature_Criterion_factory (); + TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) create_for_unmarshal (); +}; + + + +class Position_Criterion_impl : + public virtual OBV_Position_Criterion, + public virtual OBV_Event, + public virtual CORBA::DefaultValueRefCountBase +{ +public: + Position_Criterion_impl (); + Position_Criterion_impl (CORBA::ULong origin_id, + Position *lb, + Position *tr); + virtual ~Position_Criterion_impl (); + + CORBA::Boolean is_critical (Event* e); + virtual void do_print (void); +}; + +class Position_Criterion_factory : public Position_Criterion_init +{ + friend Position; +private: + virtual ~Position_Criterion_factory (); + TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion) create_for_unmarshal (); +}; + + + +class Log_Msg_Criterion_impl : public virtual OBV_Log_Msg_Criterion, + public virtual OBV_Event, + public virtual CORBA::DefaultValueRefCountBase +{ +public: + Log_Msg_Criterion_impl (); + virtual ~Log_Msg_Criterion_impl (); + + CORBA::Boolean is_critical (Event* e); + virtual void do_print (void); +}; + +class Log_Msg_Criterion_factory : public Log_Msg_Criterion_init +{ + friend Log_Msg; +private: + virtual ~Log_Msg_Criterion_factory (); + TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion) create_for_unmarshal (); +}; + + +class Criterion_List_impl : public virtual OBV_Criterion_List, + public virtual CORBA::DefaultValueRefCountBase +{ + public: + Criterion_List_impl (); + virtual ~Criterion_List_impl (); + + void store_criterion (Criterion *c); + CORBA::Boolean is_critical (Event *e); +}; + + +// This is just a wrapper and it uses the Event_List_Iterator on +// the underlaying Event_List. Better would be a template for all the +// iterators. + +class Criterion_List_Iterator +{ + public: + Criterion_List_Iterator (Criterion_List *list); + // Construct it to point to the first list link. + + virtual ~Criterion_List_Iterator (); + + void init (Criterion_List *list); + + Criterion *next (); + // Get pointer to the current Criterion. + + void advance (); + // Walks one Criterion ahead. + + private: + Event_List_Iterator iterator_; +}; + + +// Some origin_id's + +#define KITCHEN 1001 +#define BATHROOM 1002 +#define JONAS 1 diff --git a/TAO/examples/OBV/Typed_Events/Makefile b/TAO/examples/OBV/Typed_Events/Makefile new file mode 100644 index 00000000000..fca81cbd96d --- /dev/null +++ b/TAO/examples/OBV/Typed_Events/Makefile @@ -0,0 +1,86 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +ifndef TAO_ROOT + TAO_ROOT = $(ACE_ROOT)/TAO +endif # ! TAO_ROOT + +LDLIBS = -lTAO + +IDL_SRC = Event_TypesC.cpp Event_TypesS.cpp + +PROG_SRCS = \ + client.cpp \ + server.cpp \ + Server_i.cpp \ + Client_i.cpp \ + Event_Types_impl.cpp \ + ../Simple_util.cpp + +SRC = $(IDL_SRC) $(PROG_SRCS) + +SIMPLE_CLT_OBJS = \ + Event_TypesC.o \ + Event_TypesS.o \ + Client_i.o \ + Event_Types_impl.o \ + ../Simple_util.o \ + client.o +SIMPLE_SVR_OBJS = \ + Event_TypesC.o \ + Event_TypesS.o \ + Server_i.o \ + Event_Types_impl.o \ + ../Simple_util.o \ + server.o + +BIN = server \ + client + +BUILD = $(BIN) +VLDLIBS = $(LDLIBS:%=%$(VAR)) +VBIN = $(BIN:%=%$(VAR)) + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +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 $(TAO_ROOT)/taoconfig.mk + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +LDFLAGS += -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs +override TAO_IDLFLAGS += -Gc -Gv + +.PRECIOUS: Event_TypesC.cpp Event_TypesC.i Event_TypesC.h +.PRECIOUS: Event_TypesS.cpp Event_TypesS.i Event_TypesS.h +.PRECIOUS: Event_TypesS_T.cpp Event_TypesS_T.i Event_TypesS_T.h + +server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +realclean: clean + -/bin/rm -rf Event_TypesC.* Event_TypesS.* Event_TypesS_T.* + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + diff --git a/TAO/examples/OBV/Typed_Events/README b/TAO/examples/OBV/Typed_Events/README new file mode 100644 index 00000000000..77b3950e13f --- /dev/null +++ b/TAO/examples/OBV/Typed_Events/README @@ -0,0 +1,31 @@ +// $Id$ + +Typed Events +============ + +This is a demonstration of the CORBA 2.3 valuetype feature. +Event_Types.idl defines a hierarchy of event classes. The common +attributes (indeed not CORBA attributes, they're state members) +like creation time and id of the origin are in a base class. +Concrete events like Temperature, Position and Log Message are derived +from this class. + +The client sends a few random events to the server. The server has +suitable implementations of the event classes. So it is able to +show the incoming events by invoking the do_print () operation, which is +declared in the Event baseclass. +After that the server does an "alarm" check on the event. +For each possible origin id (KITCHEN, BATHROOM) a criterion has been +registered. The criterion which equals the origin id of the event is +searched and then asked with is_critical (event). + +Finally a list with all the events which causes an alarm is +requested by the client. + + +Start with: + +% ./server -o ior +% ./client -f ior [-x] + + diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp new file mode 100644 index 00000000000..9d61d0c4e28 --- /dev/null +++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp @@ -0,0 +1,173 @@ +// $Id$ + +#include "Server_i.h" +#include "Event_Types_impl.h" + + +Event_List_var alarms; +// The list of events which caused an alarm. ('Singleton') + +Criterion_List_var criterions; +// Arriving events are tested against the list members. + + + +// Set the ORB pointer, register OBV factories and init the +// lists declared above. + +void +Checkpoint_i::orb (CORBA::ORB_ptr o) +{ + this->orb_ = CORBA::ORB::_duplicate (o); + + // Make factories to unmarshal OBV. The macro TAO_OBV_REGISTER_FACTORY is defined + // in tao/ValueFactory.h to prevent from getting wound fingertips. + // Notice that the way we currently do register_factory is not OMG conform. + + // TAO_OBV_REGISTER_FACTORY (Event_factory); + // This one not. Event behaves as an abstract base, + // so we should't receive it (see header file) + + TAO_OBV_REGISTER_FACTORY (Temperature_factory); + TAO_OBV_REGISTER_FACTORY (Position_factory); + TAO_OBV_REGISTER_FACTORY (Log_Msg_factory); + TAO_OBV_REGISTER_FACTORY (Event_List_factory); + TAO_OBV_REGISTER_FACTORY (Event_List_Link_factory); + + // This list is returned by get_critical_events (). + alarms = new Event_List_impl; + + // Now we build the list against which the events are tested. + criterions = new Criterion_List_impl; + + // The conditions which will raise an alarm follow. + + // The first parameter is the origin_id and the second the temperature. + Temperature_Criterion_var tc (new Temperature_Criterion_impl (KITCHEN, 32)); + criterions->store_criterion (tc.in ()); + + tc = new Temperature_Criterion_impl (BATHROOM, 27); + criterions->store_criterion (tc.in ()); + + + // Alarm if little Jonas is not in the child's room + + Point leftbottom = {1, 2, 3}; + Position_var leftbottom_v (new Position_impl (leftbottom)); + Point topright = {2, 3, 4}; + Position_var topright_v (new Position_impl (topright)); + Position_Criterion_var pc (new Position_Criterion_impl (JONAS, + leftbottom_v, + topright_v)); + criterions->store_criterion (pc.in ()); + + // Generic criterion matches every urgent massage + Log_Msg_Criterion_var lc (new Log_Msg_Criterion_impl); + // Null id flags to handle every Log_Msg + lc->origin_id_ (0); + criterions->store_criterion (lc.in ()); + + ACE_DEBUG ((LM_DEBUG, "This criterions are stored:\n")); + for (Criterion_List_Iterator i (criterions); i.next (); i.advance ()) + { + Event *e = Event::_downcast (i.next ()); + e->do_print (); + } + ACE_DEBUG ((LM_DEBUG, "\nNow waiting for events...\n")); +} + + +// Sidebar on assignment from pointer to _var type. +// +// Event_var e_var (event); +// This is fatal because the reference counter in *event is not increased +// when a pointer is assigned to a _var. (This happens only +// in assignments from another Event_var; +// But Assignment from new is fine, the referencecount is yet one.) +// +// ok is +// CORBA::add_ref (event); +// Event_var e_var (event); +// +// but possibly easier to read it a macro +#define DUP_REF(vt_ptr) (CORBA::add_ref (vt_ptr), vt_ptr) +// then it reads: Event_var e_var (DUP_REF (event)); +// (But it may cause desaster if vt_ptr is a function call.) +// +// Be careful with assignments from T1_var to T2_var, if T1 and T2 are +// related through inheritance. Because there are many implicit casts +// between pointer and _var types possible, the reference counter of +// the duplicated reference is not increased. +// +// Is there any general solution with faulty reference counting ? + + +void +Checkpoint_i::put_event (Event *event, + CORBA::Environment &ACE_TRY_ENV) +{ + // In general this function would be a dispatcher which looks at the + // origin id and finds an event handler object for the event. The + // event handler then would (type-safe) downcast the event to the + // concrete type it can handle. Here we only apply the list of + // criterions to the event. + + + // Let us see what event has arrived + event->do_print (); + + // Does it match any criterion for alarm ? + if (criterions->is_critical (event)) + { + alarms->store_event (event); + } + + + + // If we want to return the event (e.g. return type is Event *) + // return (DUP_REF (event)); + // should be right. + + return; +} + + +Event_List * +Checkpoint_i::get_critical_events (CORBA::Environment &ACE_TRY_ENV) +{ + // The skeleton should not steal our list by decrementing + // the reference counter. + + CORBA::add_ref (alarms.ptr ()); + + // alarms._retn () would reset and destroy our alarms. + + return alarms.in (); +} + + +// Shutdown the server application. + +void +Checkpoint_i::shutdown (CORBA::Environment &) +{ + ACE_DEBUG ((LM_DEBUG, + "\n%s\n", + "The Checkpoint server is shutting down")); + + // Instruct the ORB to shutdown. + this->orb_->shutdown (); +} + + +// Constructor. + +Checkpoint_i::Checkpoint_i (void) +{ +} + +// Destructor. + +Checkpoint_i::~Checkpoint_i (void) +{ +} diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h new file mode 100644 index 00000000000..76bfacc68c2 --- /dev/null +++ b/TAO/examples/OBV/Typed_Events/Server_i.h @@ -0,0 +1,59 @@ +// -*- C++ -*- +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// TAO/tests/OBV/Typed_Events +// +// = FILENAME +// Server_i.h +// +// = DESCRIPTION +// This class implements the Event_Types IDL interface. +// +// = AUTHOR +// Torsten Kuepper +// derived from the Echo example TAO/example/Simple/echo +// of Kirthika Parameswaran <kirthika@cs.wustl.edu> +// +// ============================================================================ + +#ifndef ECHO_I_H +#define ECHO_I_H + +#include "Event_TypesS.h" + + +class Checkpoint_i : public POA_Checkpoint +{ +public: + // = Initialization and termination methods. + Checkpoint_i (void); + // Constructor. + + ~Checkpoint_i (void); + // Destructor. + + virtual void put_event ( + Event * e, + CORBA::Environment &ACE_TRY_ENV + ); + + virtual Event_List * get_critical_events ( + CORBA::Environment &ACE_TRY_ENV + ); + + virtual void shutdown (CORBA::Environment &env); + // Shutdown the server. + + void orb (CORBA::ORB_ptr o); + // Set the ORB pointer. + +private: + CORBA::ORB_var orb_; + // ORB pointer. +}; + +#endif /* ECHO_I_H */ + diff --git a/TAO/examples/OBV/Typed_Events/client.cpp b/TAO/examples/OBV/Typed_Events/client.cpp new file mode 100644 index 00000000000..d4e502a26bd --- /dev/null +++ b/TAO/examples/OBV/Typed_Events/client.cpp @@ -0,0 +1,23 @@ +//$Id$ + +# include "Client_i.h" + +// The client program for the application. + +int +main (int argc, char **argv) +{ + Checkpoint_Client_i client; + + + ACE_DEBUG ((LM_DEBUG, + "\nEvent_Types client\n\n")); + + if (client.run ("Event_Types_Checkpoint", + argc, + argv) == -1) + return -1; + else + return 0; + +} diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp new file mode 100644 index 00000000000..076099e93c9 --- /dev/null +++ b/TAO/examples/OBV/Typed_Events/server.cpp @@ -0,0 +1,52 @@ +// $Id$ +#include "../Simple_util.h" +#include "Server_i.h" + +// This is the main driver program for the time and date server. + +int +main (int argc, char *argv[]) +{ + Server<Checkpoint_i> server; + + ACE_DEBUG ((LM_DEBUG, + "\n\tCheckpoint Event_Types server\n\n")); + + ACE_DECLARE_NEW_CORBA_ENV; + + ACE_TRY + { + if (server.init ("Event_Types_Checkpoint", + argc, + argv, + ACE_TRY_ENV) == -1) + return 1; + else + { + server.run (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + } + ACE_CATCH (CORBA::SystemException, sysex) + { + ACE_UNUSED_ARG (sysex); + ACE_TRY_ENV.print_exception ("System Exception"); + return -1; + } + ACE_CATCH (CORBA::UserException, userex) + { + ACE_UNUSED_ARG (userex); + ACE_TRY_ENV.print_exception ("User Exception"); + return -1; + } + ACE_ENDTRY; + + return 0; +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +template class Server<Checkpoint_i>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate Server<Checkpoint_i> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/examples/POA/Adapter_Activator/Makefile b/TAO/examples/POA/Adapter_Activator/Makefile index 8c58563ef23..2e2eb913764 100644 --- a/TAO/examples/POA/Adapter_Activator/Makefile +++ b/TAO/examples/POA/Adapter_Activator/Makefile @@ -160,6 +160,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -170,8 +172,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -307,6 +307,10 @@ endif $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ../Generic_Servant/generic_servant_export.h ../Generic_Servant/FooC.i \ ../Generic_Servant/FooS_T.h ../Generic_Servant/FooS_T.i \ ../Generic_Servant/FooS_T.cpp ../Generic_Servant/FooS.i diff --git a/TAO/examples/POA/DSI/Makefile b/TAO/examples/POA/DSI/Makefile index d251551894a..055293ae36b 100644 --- a/TAO/examples/POA/DSI/Makefile +++ b/TAO/examples/POA/DSI/Makefile @@ -172,6 +172,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -182,8 +184,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -319,6 +319,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ DatabaseC.i DatabaseS.h DatabaseS_T.h DatabaseS_T.i DatabaseS_T.cpp \ DatabaseS.i .obj/DatabaseS.o .obj/DatabaseS.so .shobj/DatabaseS.o .shobj/DatabaseS.so: DatabaseS.cpp DatabaseS.h DatabaseC.h \ @@ -438,6 +442,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -448,8 +454,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -585,6 +589,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ DatabaseC.i DatabaseS_T.h DatabaseS_T.i DatabaseS_T.cpp DatabaseS.i .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Database_i.h DatabaseS.h DatabaseC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -703,6 +711,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -713,8 +723,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -850,6 +858,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ DatabaseC.i DatabaseS_T.h DatabaseS_T.i DatabaseS_T.cpp DatabaseS.i \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i @@ -975,6 +987,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -985,8 +999,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1122,6 +1134,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ DatabaseC.i .obj/Database_i.o .obj/Database_i.so .shobj/Database_i.o .shobj/Database_i.so: Database_i.cpp Database_i.h DatabaseS.h DatabaseC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -1240,6 +1256,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1250,8 +1268,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1387,6 +1403,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ DatabaseC.i DatabaseS_T.h DatabaseS_T.i DatabaseS_T.cpp DatabaseS.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/POA/Default_Servant/Makefile b/TAO/examples/POA/Default_Servant/Makefile index 59f61591520..0c9ed583c15 100644 --- a/TAO/examples/POA/Default_Servant/Makefile +++ b/TAO/examples/POA/Default_Servant/Makefile @@ -172,6 +172,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -182,8 +184,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -319,6 +319,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ FileC.i FileS.h FileS_T.h FileS_T.i FileS_T.cpp FileS.i .obj/FileS.o .obj/FileS.so .shobj/FileS.o .shobj/FileS.so: FileS.cpp FileS.h FileC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -437,6 +441,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -447,8 +453,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -584,6 +588,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ FileC.i FileS_T.h FileS_T.i FileS_T.cpp FileS.i .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \ $(ACE_ROOT)/ace/streams.h \ @@ -705,6 +713,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -715,8 +725,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -852,6 +860,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ FileC.i FileS_T.h FileS_T.i FileS_T.cpp FileS.i .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \ $(ACE_ROOT)/ace/streams.h \ @@ -975,6 +987,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -985,8 +999,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1122,6 +1134,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ FileC.i .obj/File_i.o .obj/File_i.so .shobj/File_i.o .shobj/File_i.so: File_i.cpp File_i.h FileS.h FileC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -1240,6 +1256,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1250,8 +1268,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1387,6 +1403,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ FileC.i FileS_T.h FileS_T.i FileS_T.cpp FileS.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/POA/Explicit_Activation/Makefile b/TAO/examples/POA/Explicit_Activation/Makefile index f7004d85320..15f06d6b624 100644 --- a/TAO/examples/POA/Explicit_Activation/Makefile +++ b/TAO/examples/POA/Explicit_Activation/Makefile @@ -162,6 +162,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -172,8 +174,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -309,6 +309,10 @@ endif $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ../Generic_Servant/generic_servant_export.h ../Generic_Servant/FooC.i \ ../Generic_Servant/FooS_T.h ../Generic_Servant/FooS_T.i \ ../Generic_Servant/FooS_T.cpp ../Generic_Servant/FooS.i diff --git a/TAO/examples/POA/FindPOA/Makefile b/TAO/examples/POA/FindPOA/Makefile index e0e781c682a..4b1def52deb 100644 --- a/TAO/examples/POA/FindPOA/Makefile +++ b/TAO/examples/POA/FindPOA/Makefile @@ -157,6 +157,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -167,8 +169,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -303,6 +303,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ - $(TAO_ROOT)/tao/Union.h + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/POA/Forwarding/Makefile b/TAO/examples/POA/Forwarding/Makefile index 943bab5a355..b57877e191b 100644 --- a/TAO/examples/POA/Forwarding/Makefile +++ b/TAO/examples/POA/Forwarding/Makefile @@ -172,6 +172,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -182,8 +184,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -319,6 +319,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ FooC.i FooS.h FooS_T.h FooS_T.i FooS_T.cpp FooS.i .obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -437,6 +441,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -447,8 +453,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -584,6 +588,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \ $(TAO_ROOT)/tao/corba.h \ @@ -702,6 +710,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -712,8 +722,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -849,6 +857,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(ACE_ROOT)/ace/Read_Buffer.h \ $(ACE_ROOT)/ace/Read_Buffer.i \ $(ACE_ROOT)/ace/Get_Opt.h \ @@ -972,6 +984,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -982,8 +996,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1119,6 +1131,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Read_Buffer.h \ @@ -1241,6 +1257,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1251,8 +1269,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1388,6 +1404,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ MyFooServant.h FooS.h FooC.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp \ FooS.i Servant_Locator.h .obj/Servant_Locator.o .obj/Servant_Locator.so .shobj/Servant_Locator.o .shobj/Servant_Locator.so: Servant_Locator.cpp Servant_Locator.h \ @@ -1507,6 +1527,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1517,8 +1539,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1654,6 +1674,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ MyFooServant.h FooS.h FooC.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp \ FooS.i diff --git a/TAO/examples/POA/Generic_Servant/Makefile b/TAO/examples/POA/Generic_Servant/Makefile index 5daf05e3edd..75808e9a3b2 100644 --- a/TAO/examples/POA/Generic_Servant/Makefile +++ b/TAO/examples/POA/Generic_Servant/Makefile @@ -186,6 +186,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -196,8 +198,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -333,6 +333,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ generic_servant_export.h FooC.i FooS.h FooS_T.h FooS_T.i FooS_T.cpp \ FooS.i .obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.h \ @@ -452,6 +456,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -462,8 +468,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -599,6 +603,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ generic_servant_export.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i .obj/MyFooServant.o .obj/MyFooServant.so .shobj/MyFooServant.o .shobj/MyFooServant.so: MyFooServant.cpp MyFooServant.h FooS.h FooC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -717,6 +725,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -727,8 +737,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -864,6 +872,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ generic_servant_export.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/POA/Identity/Makefile b/TAO/examples/POA/Identity/Makefile index 329e7e3e7d5..d3d26677bc7 100644 --- a/TAO/examples/POA/Identity/Makefile +++ b/TAO/examples/POA/Identity/Makefile @@ -166,6 +166,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -176,8 +178,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -313,6 +313,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ testC.i testS.h testS_T.h testS_T.i testS_T.cpp testS.i .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -431,6 +435,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -441,8 +447,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -578,6 +582,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ testC.i testS_T.h testS_T.i testS_T.cpp testS.i .obj/Identity.o .obj/Identity.so .shobj/Identity.o .shobj/Identity.so: Identity.cpp testS.h testC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -696,6 +704,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -706,8 +716,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -843,6 +851,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ testC.i testS_T.h testS_T.i testS_T.cpp testS.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/POA/Loader/Makefile b/TAO/examples/POA/Loader/Makefile index 1579a8230d9..ac116444ec1 100644 --- a/TAO/examples/POA/Loader/Makefile +++ b/TAO/examples/POA/Loader/Makefile @@ -4,15 +4,15 @@ BIN = server -MYFILES = Server_Manager Servant_Activator Servant_Locator +MYFILES = Server_Manager Servant_Activator Servant_Locator SRC = $(addsuffix .cpp,$(MYFILES)) $(addsuffix .cpp, $(BIN)) OBJ = $(addsuffix .o,$(MYFILES)) -CPPFLAGS += -I$(TAO_ROOT) +CPPFLAGS += -I$(TAO_ROOT) LDLIBS = -lTAO -LDFLAGS += -L$(TAO_ROOT)/tao +LDFLAGS += -L$(TAO_ROOT)/tao VLDLIBS = $(LDLIBS:%=%$(VAR)) @@ -161,6 +161,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -171,8 +173,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -308,6 +308,10 @@ endif $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(ACE_ROOT)/ace/DLL.h \ Servant_Locator.h \ $(ACE_ROOT)/ace/Get_Opt.h \ @@ -429,6 +433,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -439,8 +445,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -576,6 +580,10 @@ endif $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(ACE_ROOT)/ace/DLL.h .obj/Servant_Locator.o .obj/Servant_Locator.so .shobj/Servant_Locator.o .shobj/Servant_Locator.so: Servant_Locator.cpp Servant_Locator.h \ $(ACE_ROOT)/ace/OS.h \ @@ -694,6 +702,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -704,8 +714,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -841,6 +849,10 @@ endif $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(ACE_ROOT)/ace/DLL.h .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Server_Manager.h \ $(ACE_ROOT)/ace/streams.h \ @@ -960,6 +972,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -970,8 +984,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1107,6 +1119,10 @@ endif $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(ACE_ROOT)/ace/DLL.h \ Servant_Locator.h diff --git a/TAO/examples/POA/NewPOA/Makefile b/TAO/examples/POA/NewPOA/Makefile index 5fedfad10fe..59fef08c5be 100644 --- a/TAO/examples/POA/NewPOA/Makefile +++ b/TAO/examples/POA/NewPOA/Makefile @@ -157,6 +157,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -167,8 +169,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -303,6 +303,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ - $(TAO_ROOT)/tao/Union.h + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile b/TAO/examples/POA/On_Demand_Activation/Makefile index db9a00edf14..91815ddc8cd 100644 --- a/TAO/examples/POA/On_Demand_Activation/Makefile +++ b/TAO/examples/POA/On_Demand_Activation/Makefile @@ -160,6 +160,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -170,8 +172,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -307,6 +307,10 @@ endif $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ../Generic_Servant/MyFooServant.h ../Generic_Servant/FooS.h \ ../Generic_Servant/FooC.h ../Generic_Servant/generic_servant_export.h \ ../Generic_Servant/FooC.i ../Generic_Servant/FooS_T.h \ @@ -429,6 +433,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -439,8 +445,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -576,6 +580,10 @@ endif $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ../Generic_Servant/MyFooServant.h ../Generic_Servant/FooS.h \ ../Generic_Servant/FooC.h ../Generic_Servant/generic_servant_export.h \ ../Generic_Servant/FooC.i ../Generic_Servant/FooS_T.h \ @@ -701,6 +709,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -711,8 +721,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -848,6 +856,10 @@ endif $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Servant_Locator.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile b/TAO/examples/POA/On_Demand_Loading/Makefile index 7baccac5969..bde0030f5fa 100644 --- a/TAO/examples/POA/On_Demand_Loading/Makefile +++ b/TAO/examples/POA/On_Demand_Loading/Makefile @@ -4,7 +4,7 @@ BIN = server -MYFILES = Server_Manager Servant_Manager Servant_Activator Servant_Locator +MYFILES = Server_Manager Servant_Manager Servant_Activator Servant_Locator SRC = $(addsuffix .cpp,$(MYFILES)) $(addsuffix .cpp, $(BIN)) OBJ = $(addsuffix .o,$(MYFILES)) @@ -162,6 +162,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -172,8 +174,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -309,6 +309,10 @@ endif $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Servant_Locator.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i @@ -430,6 +434,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -440,8 +446,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -576,7 +580,11 @@ endif $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ - $(TAO_ROOT)/tao/Union.h + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i .obj/Servant_Activator.o .obj/Servant_Activator.so .shobj/Servant_Activator.o .shobj/Servant_Activator.so: Servant_Activator.cpp Servant_Activator.h \ Servant_Manager.h \ $(ACE_ROOT)/ace/OS.h \ @@ -696,6 +704,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -706,8 +716,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -842,7 +850,11 @@ endif $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ - $(TAO_ROOT)/tao/Union.h + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i .obj/Servant_Locator.o .obj/Servant_Locator.so .shobj/Servant_Locator.o .shobj/Servant_Locator.so: Servant_Locator.cpp Servant_Locator.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ @@ -960,6 +972,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -970,8 +984,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1107,6 +1119,10 @@ endif $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(ACE_ROOT)/ace/DLL.h \ Servant_Manager.h .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Server_Manager.h \ @@ -1228,6 +1244,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1238,8 +1256,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1375,6 +1391,10 @@ endif $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Servant_Locator.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/POA/Reference_Counted_Servant/Makefile b/TAO/examples/POA/Reference_Counted_Servant/Makefile index f90bd399da3..b1bccf3da5b 100644 --- a/TAO/examples/POA/Reference_Counted_Servant/Makefile +++ b/TAO/examples/POA/Reference_Counted_Servant/Makefile @@ -41,7 +41,8 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS)) # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp $(ACE_ROOT)/ace/Get_Opt.h \ +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \ + $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ @@ -161,6 +162,8 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -171,8 +174,6 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -308,6 +309,10 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ../Generic_Servant/generic_servant_export.h ../Generic_Servant/FooC.i \ ../Generic_Servant/FooS_T.h ../Generic_Servant/FooS_T.i \ ../Generic_Servant/FooS_T.cpp ../Generic_Servant/FooS.i diff --git a/TAO/examples/POA/RootPOA/Makefile b/TAO/examples/POA/RootPOA/Makefile index db92487cbde..7cd8f06c4b8 100644 --- a/TAO/examples/POA/RootPOA/Makefile +++ b/TAO/examples/POA/RootPOA/Makefile @@ -156,6 +156,8 @@ endif $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -166,8 +168,6 @@ endif $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -302,6 +302,10 @@ endif $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ - $(TAO_ROOT)/tao/Union.h + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/POA/TIE/Makefile b/TAO/examples/POA/TIE/Makefile index 6b7b41845a6..d5e00285804 100644 --- a/TAO/examples/POA/TIE/Makefile +++ b/TAO/examples/POA/TIE/Makefile @@ -183,6 +183,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -193,8 +195,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -330,6 +330,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ FooC.i FooS.h FooS_T.h FooS_T.i FooS_T.cpp FooS.i .obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -448,6 +452,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -458,8 +464,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -595,6 +599,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \ $(ACE_ROOT)/ace/streams.h \ @@ -714,6 +722,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -724,8 +734,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -861,6 +869,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \ $(ACE_ROOT)/ace/streams.h \ @@ -987,6 +999,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -997,8 +1011,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1133,6 +1145,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ FooC.i .obj/Foo_i.o .obj/Foo_i.so .shobj/Foo_i.o .shobj/Foo_i.so: Foo_i.cpp Foo_i.h FooS.h FooC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -1251,6 +1267,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1261,8 +1279,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1398,6 +1414,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/Quoter/Makefile b/TAO/examples/Quoter/Makefile index f1bc24569ad..4d4022692b4 100644 --- a/TAO/examples/Quoter/Makefile +++ b/TAO/examples/Quoter/Makefile @@ -226,6 +226,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -236,8 +238,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -373,6 +373,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ @@ -510,6 +514,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -520,8 +526,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -657,6 +661,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ @@ -790,6 +798,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -800,8 +810,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -937,6 +945,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ client.h \ @@ -1066,6 +1078,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1076,8 +1090,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1213,6 +1225,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ @@ -1354,6 +1370,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1364,8 +1382,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1501,6 +1517,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Quoter_i.h QuoterS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ @@ -1635,6 +1655,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1645,8 +1667,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1782,6 +1802,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Factory_Finder.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ @@ -1922,6 +1946,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1932,8 +1958,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2069,6 +2093,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Factory_Finder_i.h QuoterS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ @@ -2203,6 +2231,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -2213,8 +2243,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2350,6 +2378,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \ @@ -2492,6 +2524,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -2502,8 +2536,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2639,6 +2671,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ Generic_Factory_i.h QuoterS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ diff --git a/TAO/examples/Simple/bank/Makefile b/TAO/examples/Simple/bank/Makefile index ebf7a232db7..c074abb6288 100644 --- a/TAO/examples/Simple/bank/Makefile +++ b/TAO/examples/Simple/bank/Makefile @@ -209,6 +209,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -219,8 +221,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -356,6 +356,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ BankC.i BankS.h BankS_T.h BankS_T.i BankS_T.cpp BankS.i .obj/BankS.o .obj/BankS.so .shobj/BankS.o .shobj/BankS.so: BankS.cpp BankS.h BankC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -474,6 +478,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -484,8 +490,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -621,6 +625,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ BankC.i BankS_T.h BankS_T.i BankS_T.cpp BankS.i .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Bank_Client_i.h ../Simple_util.h \ $(TAO_ROOT)/tao/TAO.h \ @@ -750,6 +758,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -757,8 +767,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -888,6 +896,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -1035,6 +1047,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1042,8 +1056,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1173,6 +1185,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -1310,6 +1326,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1320,8 +1338,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1457,6 +1473,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ BankC.i BankS_T.h BankS_T.i BankS_T.cpp BankS.i .obj/AccountManager_i.o .obj/AccountManager_i.so .shobj/AccountManager_i.o .shobj/AccountManager_i.so: AccountManager_i.cpp AccountManager_i.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -1586,6 +1606,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1593,8 +1615,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1724,6 +1744,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ BankC.i BankS_T.h BankS_T.i BankS_T.cpp BankS.i Account_i.h .obj/Bank_Client_i.o .obj/Bank_Client_i.so .shobj/Bank_Client_i.o .shobj/Bank_Client_i.so: Bank_Client_i.cpp Bank_Client_i.h ../Simple_util.h \ $(TAO_ROOT)/tao/TAO.h \ @@ -1853,6 +1877,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1860,8 +1886,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1991,6 +2015,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -2138,6 +2166,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -2145,8 +2175,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2276,6 +2304,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ diff --git a/TAO/examples/Simple/chat/Makefile b/TAO/examples/Simple/chat/Makefile index 54abbd0c657..32d19afb799 100644 --- a/TAO/examples/Simple/chat/Makefile +++ b/TAO/examples/Simple/chat/Makefile @@ -15,6 +15,8 @@ IDL_SRC = ReceiverC.cpp ReceiverS.cpp BroadcasterC.cpp BroadcasterS.cpp PROG_SRCS = \ Receiver_i.cpp \ Broadcaster_i.cpp \ + Client_i.cpp \ + Server_i.cpp \ client.cpp \ server.cpp @@ -64,12 +66,9 @@ include $(TAO_ROOT)/taoconfig.mk LDFLAGS += -L$(TAO_ROOT)/tao CPPFLAGS += -.PRECIOUS: ReceiverC.cpp ReceiverC.i ReceiverC.h -.PRECIOUS: ReceiverS.cpp ReceiverS.i ReceiverS.h -.PRECIOUS: ReceiverS_T.cpp ReceiverS_T.i ReceiverS_T.h -.PRECIOUS: BroadcasterC.cpp BroadcasterC.i BroadcasterC.h -.PRECIOUS: BroadcasterS.cpp BroadcasterS.i BroadcasterS.h -.PRECIOUS: BroadcasterS_T.cpp BroadcasterS_T.i BroadcasterS_T.h +$(foreach ext, $(IDL_EXT), Broadcaster$(ext)): Receiver.idl + +.PRECIOUS: $(foreach file, Broadcaster Receiver, $(foreach ext, $(IDL_EXT), $(file)$(ext)))) server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) @@ -83,7 +82,7 @@ realclean: clean # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/ReceiverC.o .obj/ReceiverC.so .shobj/ReceiverC.o .shobj/ReceiverC.so: ReceiverC.cpp ReceiverC.h \ +.obj/ReceiverS.o .obj/ReceiverS.so .shobj/ReceiverS.o .shobj/ReceiverS.so: ReceiverS.cpp ReceiverS.h ReceiverC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ @@ -200,6 +199,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -210,8 +211,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -347,9 +346,12 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ - ReceiverC.i ReceiverS.h ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp \ - ReceiverS.i -.obj/ReceiverS.o .obj/ReceiverS.so .shobj/ReceiverS.o .shobj/ReceiverS.so: ReceiverS.cpp ReceiverS.h ReceiverC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i +.obj/ReceiverC.o .obj/ReceiverC.so .shobj/ReceiverC.o .shobj/ReceiverC.so: ReceiverC.cpp ReceiverC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ @@ -466,6 +468,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -476,8 +480,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -613,7 +615,12 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ - ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + ReceiverC.i ReceiverS.h ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp \ + ReceiverS.i .obj/BroadcasterC.o .obj/BroadcasterC.so .shobj/BroadcasterC.o .shobj/BroadcasterC.so: BroadcasterC.cpp BroadcasterC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ @@ -731,6 +738,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -741,8 +750,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -878,6 +885,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ReceiverC.h ReceiverC.i BroadcasterC.i BroadcasterS.h ReceiverS.h \ ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \ BroadcasterS_T.h BroadcasterS_T.i BroadcasterS_T.cpp BroadcasterS.i @@ -999,6 +1010,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1009,8 +1022,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1146,10 +1157,15 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \ BroadcasterC.h BroadcasterC.i BroadcasterS_T.h BroadcasterS_T.i \ BroadcasterS_T.cpp BroadcasterS.i -.obj/Receiver_i.o .obj/Receiver_i.so .shobj/Receiver_i.o .shobj/Receiver_i.so: Receiver_i.cpp Receiver_i.h ReceiverS.h ReceiverC.h \ +.obj/Broadcaster_i.o .obj/Broadcaster_i.so .shobj/Broadcaster_i.o .shobj/Broadcaster_i.so: Broadcaster_i.cpp Broadcaster_i.h BroadcasterS.h \ + ReceiverS.h ReceiverC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ @@ -1266,6 +1282,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1276,8 +1294,278 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/singletons.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(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/DynAnyC.h \ + $(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 \ + $(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/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.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 \ + $(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 \ + $(TAO_ROOT)/tao/Connect.h \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(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/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.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_Acceptor.i \ + $(TAO_ROOT)/tao/Connect.i \ + $(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/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 \ + $(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/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \ + BroadcasterC.h BroadcasterC.i BroadcasterS_T.h BroadcasterS_T.i \ + BroadcasterS_T.cpp BroadcasterS.i \ + $(TAO_ROOT)/tao/TAO.h +.obj/Receiver_i.o .obj/Receiver_i.so .shobj/Receiver_i.o .shobj/Receiver_i.so: Receiver_i.cpp Receiver_i.h ReceiverS.h ReceiverC.h \ + $(TAO_ROOT)/tao/corba.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.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 \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(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/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(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 \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(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/Principal.i \ + $(TAO_ROOT)/tao/Request.h \ $(TAO_ROOT)/tao/Context.h \ $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/Request.i \ + $(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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1413,8 +1701,12 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i -.obj/Broadcaster_i.o .obj/Broadcaster_i.so .shobj/Broadcaster_i.o .shobj/Broadcaster_i.so: Broadcaster_i.cpp Broadcaster_i.h BroadcasterS.h \ +.obj/Server_i.o .obj/Server_i.so .shobj/Server_i.o .shobj/Server_i.so: Server_i.cpp Server_i.h Broadcaster_i.h BroadcasterS.h \ ReceiverS.h ReceiverC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ @@ -1532,6 +1824,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1542,8 +1836,281 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/singletons.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(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/DynAnyC.h \ + $(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 \ + $(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/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.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 \ + $(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 \ + $(TAO_ROOT)/tao/Connect.h \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(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/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.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_Acceptor.i \ + $(TAO_ROOT)/tao/Connect.i \ + $(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/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 \ + $(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/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ + $(TAO_ROOT)/tao/DynAny_i.h \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \ + BroadcasterC.h BroadcasterC.i BroadcasterS_T.h BroadcasterS_T.i \ + BroadcasterS_T.cpp BroadcasterS.i \ + $(TAO_ROOT)/tao/TAO.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Server_i.h Broadcaster_i.h BroadcasterS.h \ + ReceiverS.h ReceiverC.h \ + $(TAO_ROOT)/tao/corba.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.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 \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(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/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(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 \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(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/Principal.i \ + $(TAO_ROOT)/tao/Request.h \ $(TAO_ROOT)/tao/Context.h \ $(TAO_ROOT)/tao/Context.i \ + $(TAO_ROOT)/tao/Request.i \ + $(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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1679,11 +2246,16 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \ BroadcasterC.h BroadcasterC.i BroadcasterS_T.h BroadcasterS_T.i \ BroadcasterS_T.cpp BroadcasterS.i \ $(TAO_ROOT)/tao/TAO.h -.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Client_i.h Receiver_i.h ReceiverS.h ReceiverC.h \ +.obj/Client_i.o .obj/Client_i.so .shobj/Client_i.o .shobj/Client_i.so: Client_i.cpp Client_i.h Receiver_i.h ReceiverS.h \ + ReceiverC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ @@ -1800,6 +2372,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1810,8 +2384,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1947,13 +2519,18 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \ BroadcasterC.h BroadcasterC.i \ $(ACE_ROOT)/ace/Read_Buffer.h \ $(ACE_ROOT)/ace/Read_Buffer.i \ - $(TAO_ROOT)/tao/TAO.h -.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Server_i.h Broadcaster_i.h BroadcasterS.h \ - ReceiverS.h ReceiverC.h \ + $(TAO_ROOT)/tao/TAO.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i +.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Client_i.h Receiver_i.h ReceiverS.h ReceiverC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ @@ -2070,6 +2647,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -2080,8 +2659,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2217,9 +2794,14 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \ - BroadcasterC.h BroadcasterC.i BroadcasterS_T.h BroadcasterS_T.i \ - BroadcasterS_T.cpp BroadcasterS.i \ + BroadcasterC.h BroadcasterC.i \ + $(ACE_ROOT)/ace/Read_Buffer.h \ + $(ACE_ROOT)/ace/Read_Buffer.i \ $(TAO_ROOT)/tao/TAO.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/Simple/echo/Makefile b/TAO/examples/Simple/echo/Makefile index 414220f7b9f..eab14e1278d 100644 --- a/TAO/examples/Simple/echo/Makefile +++ b/TAO/examples/Simple/echo/Makefile @@ -206,6 +206,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -216,8 +218,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -353,6 +353,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ EchoC.i EchoS.h EchoS_T.h EchoS_T.i EchoS_T.cpp EchoS.i .obj/EchoS.o .obj/EchoS.so .shobj/EchoS.o .shobj/EchoS.so: EchoS.cpp EchoS.h EchoC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -471,6 +475,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -481,8 +487,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -618,6 +622,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ EchoC.i EchoS_T.h EchoS_T.i EchoS_T.cpp EchoS.i .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Echo_Client_i.h ../Simple_util.h \ $(TAO_ROOT)/tao/TAO.h \ @@ -747,6 +755,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -754,8 +764,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -885,6 +893,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -1032,6 +1044,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1039,8 +1053,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1170,6 +1182,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -1307,6 +1323,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1317,8 +1335,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1454,6 +1470,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ EchoC.i EchoS_T.h EchoS_T.i EchoS_T.cpp EchoS.i .obj/Echo_Client_i.o .obj/Echo_Client_i.so .shobj/Echo_Client_i.o .shobj/Echo_Client_i.so: Echo_Client_i.cpp Echo_Client_i.h ../Simple_util.h \ $(TAO_ROOT)/tao/TAO.h \ @@ -1583,6 +1603,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1590,8 +1612,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1721,6 +1741,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -1868,6 +1892,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1875,8 +1901,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2006,6 +2030,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ diff --git a/TAO/examples/Simple/grid/Makefile b/TAO/examples/Simple/grid/Makefile index a2a1b1741f3..7b8a5ed792c 100644 --- a/TAO/examples/Simple/grid/Makefile +++ b/TAO/examples/Simple/grid/Makefile @@ -207,6 +207,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -217,8 +219,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -354,6 +354,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ GridC.i GridS.h GridS_T.h GridS_T.i GridS_T.cpp GridS.i .obj/GridS.o .obj/GridS.so .shobj/GridS.o .shobj/GridS.so: GridS.cpp GridS.h GridC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -472,6 +476,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -482,8 +488,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -619,6 +623,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ GridC.i GridS_T.h GridS_T.i GridS_T.cpp GridS.i .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Grid_Client_i.h ../Simple_util.h \ $(TAO_ROOT)/tao/TAO.h \ @@ -748,6 +756,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -755,8 +765,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -886,6 +894,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -1033,6 +1045,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1040,8 +1054,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1171,6 +1183,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -1308,6 +1324,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1318,8 +1336,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1455,6 +1471,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ GridC.i GridS_T.h GridS_T.i GridS_T.cpp GridS.i .obj/Grid_Client_i.o .obj/Grid_Client_i.so .shobj/Grid_Client_i.o .shobj/Grid_Client_i.so: Grid_Client_i.cpp Grid_Client_i.h ../Simple_util.h \ $(TAO_ROOT)/tao/TAO.h \ @@ -1584,6 +1604,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1591,8 +1613,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1722,6 +1742,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -1869,6 +1893,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1876,8 +1902,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2007,6 +2031,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ diff --git a/TAO/examples/Simple/time/Makefile b/TAO/examples/Simple/time/Makefile index e2cfea8cc9a..e2aee7981b6 100644 --- a/TAO/examples/Simple/time/Makefile +++ b/TAO/examples/Simple/time/Makefile @@ -207,6 +207,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -217,8 +219,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -354,6 +354,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ TimeC.i TimeS.h TimeS_T.h TimeS_T.i TimeS_T.cpp TimeS.i .obj/TimeS.o .obj/TimeS.so .shobj/TimeS.o .shobj/TimeS.so: TimeS.cpp TimeS.h TimeC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -472,6 +476,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -482,8 +488,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -619,6 +623,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ TimeC.i TimeS_T.h TimeS_T.i TimeS_T.cpp TimeS.i .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Time_Client_i.h ../Simple_util.h \ $(TAO_ROOT)/tao/TAO.h \ @@ -748,6 +756,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -755,8 +765,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -886,6 +894,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -1033,6 +1045,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1040,8 +1054,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1171,6 +1183,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -1308,6 +1324,8 @@ realclean: clean $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1318,8 +1336,6 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1455,6 +1471,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ TimeC.i TimeS_T.h TimeS_T.i TimeS_T.cpp TimeS.i .obj/Time_Client_i.o .obj/Time_Client_i.so .shobj/Time_Client_i.o .shobj/Time_Client_i.so: Time_Client_i.cpp Time_Client_i.h ../Simple_util.h \ $(TAO_ROOT)/tao/TAO.h \ @@ -1584,6 +1604,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1591,8 +1613,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -1722,6 +1742,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ @@ -1869,6 +1893,8 @@ realclean: clean $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Context.h \ + $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -1876,8 +1902,6 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/Context.h \ - $(TAO_ROOT)/tao/Context.i \ $(TAO_ROOT)/tao/varout.h \ $(TAO_ROOT)/tao/varout.i \ $(TAO_ROOT)/tao/varout.cpp \ @@ -2007,6 +2031,10 @@ realclean: clean $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ |