diff options
| author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-16 21:19:02 +0000 |
|---|---|---|
| committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-16 21:19:02 +0000 |
| commit | 40fdc8a404e75ab03b68cc62e9987cf208fd8c30 (patch) | |
| tree | 37d9c4d3abe4aefd8a34ed797883dd2cd4862ca7 /TAO/orbsvcs | |
| parent | c254b281f1b9a4ca19dd0c3ee73a0654a7718909 (diff) | |
| download | ATCD-typecode-overhaul.tar.gz | |
This commit was manufactured by cvs2svn to create branchtypecode-overhaul
'typecode-overhaul'.
Diffstat (limited to 'TAO/orbsvcs')
1140 files changed, 36988 insertions, 8073 deletions
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h index 133b1c752e8..38d5bb7ad7e 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h @@ -28,8 +28,8 @@ #include "ace/Log_Msg.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/Concurrency/Concurrency_Utils.h" -#include "orbsvcs/Naming/Naming_Server.h" +#include "orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" class Concurrency_Service : public TAO_ORB_Manager { diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc index 1287013fe4b..97361a68618 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, concurrency, naming_serv { +project : orbsvcsexe, core, concurrency, naming { exename = Concurrency_Service } diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am index 2c58dcc0132..52cb1706816 100644 --- a/TAO/orbsvcs/Concurrency_Service/Makefile.am +++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am @@ -7,33 +7,34 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Concurrency_Service.am -bin_PROGRAMS = Concurrency_Service +noinst_PROGRAMS = Concurrency_Service Concurrency_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_ROOT)/orbsvcs/orbsvcs Concurrency_Service_SOURCES = \ - Concurrency_Service.cpp \ - Concurrency_Service.h + Concurrency_Service.cpp Concurrency_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosConcurrency.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +noinst_HEADERS = \ + Concurrency_Service.h + ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp index 2bb2e9205ac..4dfc74e1fde 100644 --- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp +++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" -#include "orbsvcs/CosEvent/CEC_Event_Loader.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h" #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" #include "ace/OS_main.h" diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc index 220aa334965..d5c50ee1e2f 100644 --- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc +++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, event_serv, naming, svc_utils, iortable, messaging, portableserver { +project : orbsvcsexe, core, event, naming, svc_utils, iortable, messaging, portableserver { exename = CosEvent_Service } diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am index a8ad39313de..64ad6907473 100644 --- a/TAO/orbsvcs/CosEvent_Service/Makefile.am +++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am @@ -7,38 +7,35 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.CosEvent_Service.am -if !BUILD_MINIMUM_CORBA - -bin_PROGRAMS = CosEvent_Service +noinst_PROGRAMS = CosEvent_Service CosEvent_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL + -I$(TAO_ROOT)/orbsvcs/orbsvcs \ + -DTAO_HAS_TYPED_EVENT_CHANNEL \ + $(DUMMY_VALUE_NOT_ENDING_IN_BACKSLASH) CosEvent_Service_SOURCES = \ CosEvent_Service.cpp CosEvent_Service_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp index 414aa3075b5..90c6ad963d1 100644 --- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp +++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp @@ -6,8 +6,8 @@ #include "ace/Argv_Type_Converter.h" #include "ace/OS_main.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" ACE_RCSID (Dump_Schedule, Dump_Schedule, diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am index 7fb792c49ef..926f30d88fc 100644 --- a/TAO/orbsvcs/Dump_Schedule/Makefile.am +++ b/TAO/orbsvcs/Dump_Schedule/Makefile.am @@ -7,28 +7,32 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Dump_Schedule.am -bin_PROGRAMS = Dump_Schedule +noinst_PROGRAMS = Dump_Schedule Dump_Schedule_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_ROOT)/orbsvcs/orbsvcs Dump_Schedule_SOURCES = \ Dump_Schedule.cpp Dump_Schedule_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la + ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp index c0355d78d0f..f8dad651a53 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.cpp +++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp @@ -7,14 +7,14 @@ #include "ace/Argv_Type_Converter.h" #include "ace/OS_main.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/Event/Module_Factory.h" -#include "orbsvcs/Event/Event_Channel.h" - -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/orbsvcs/Event/Event_Channel.h" + +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h index 6e6065f292b..a97012f6900 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.h +++ b/TAO/orbsvcs/Event_Service/Event_Service.h @@ -12,12 +12,12 @@ #define EC_EVENT_SERVICE_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/orbsvcs/RtecSchedulerS.h" #include "ace/SString.h" class TAO_Module_Factory; diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am index 1acbc3499a5..f4a190213f9 100644 --- a/TAO/orbsvcs/Event_Service/Makefile.am +++ b/TAO/orbsvcs/Event_Service/Makefile.am @@ -7,39 +7,41 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Event_Service.am -if !BUILD_MINIMUM_CORBA - -bin_PROGRAMS = Event_Service +noinst_PROGRAMS = Event_Service Event_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL Event_Service_SOURCES = \ - Event_Service.cpp \ - Event_Service.h + Event_Service.cpp Event_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSchedEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +noinst_HEADERS = \ + Event_Service.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp index 8f9e7124820..b4568f7dba7 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp @@ -7,9 +7,9 @@ #include "ace/INET_Addr.h" #include "ace/SOCK_Connector.h" #include "ace/SOCK_Stream.h" -#include "orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h" +#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h" #include "ace/OS_main.h" ACE_RCSID (Event_Service, diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h index 64fd3722ff6..958173e1715 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h @@ -12,10 +12,10 @@ #ifndef FT_EVENTSERVICE_H #define FT_EVENTSERVICE_H -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" -#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" +#include "orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h" #include "TP_Task.h" namespace POA_RtecScheduler diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am index c3fcee5e40f..24611ad85f2 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am @@ -7,9 +7,6 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.FTRT_Event_Service.am -if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA - noinst_PROGRAMS = ftrt_eventservice ftrt_eventservice_CPPFLAGS = \ @@ -17,15 +14,12 @@ ftrt_eventservice_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/FtRtEvent/EventChannel \ -I$(TAO_ROOT)/orbsvcs/FtRtEvent/Utils ftrt_eventservice_SOURCES = \ - FT_EventService.cpp \ - FT_EventService.h \ - TP_Task.h + FT_EventService.cpp ftrt_eventservice_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_EventChannel.la \ @@ -34,18 +28,22 @@ ftrt_eventservice_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSchedEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA -endif BUILD_CORBA_MESSAGING +noinst_HEADERS = \ + FT_EventService.h \ + TP_Task.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index 35a72e48214..a46723ae7fd 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -5,7 +5,7 @@ #include "ace/Read_Buffer.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Stream.h" -#include "orbsvcs/FtRtEvent/Utils/UUID.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h" ACE_RCSID (Factory_Service, EventChannelFactory_i, diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h index 656df7363bf..bd0c8a0b174 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h @@ -13,7 +13,7 @@ #ifndef EVENTCHANNELFACTORY_I_H #define EVENTCHANNELFACTORY_I_H -#include "orbsvcs/FT_CORBAS.h" +#include "orbsvcs/orbsvcs/FT_CORBAS.h" #include "ace/Synch.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc index fcf1d07ad22..b3dadfc1daf 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notification, event_skel { +project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notification { after += FaultTolerance exename = ftrtec_factory_service diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am index 40653ddb2b5..5bc5db16548 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am @@ -7,9 +7,6 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.FTRTEC_Factory_Service.am -if BUILD_ACE_UUID -if !BUILD_MINIMUM_CORBA - noinst_PROGRAMS = ftrtec_factory_service ftrtec_factory_service_CPPFLAGS = \ @@ -17,36 +14,35 @@ ftrtec_factory_service_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL + -I$(TAO_ROOT)/orbsvcs/orbsvcs ftrtec_factory_service_SOURCES = \ EventChannelFactory_i.cpp \ - FTRTEC_Factory_Service.cpp \ - EventChannelFactory_i.h + FTRTEC_Factory_Service.cpp ftrtec_factory_service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA -endif BUILD_ACE_UUID +noinst_HEADERS = \ + EventChannelFactory_i.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp index 3a8a8db6714..4ebd1ce8f4d 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp @@ -2,13 +2,13 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" -#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h" /// include this file to statically linked with FT ORB -#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h" /// include this file to statically linked with Transaction Depth -#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" +#include "orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" ACE_RCSID (Gateway_Service, FTRTEC_Gateway_Service, diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am index d46fcdc9e68..79ee5cfa865 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am @@ -7,9 +7,6 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.FTRTEC_Gateway_Service.am -if BUILD_ACE_UUID -if !BUILD_MINIMUM_CORBA - noinst_PROGRAMS = ftrtec_gateway_service ftrtec_gateway_service_CPPFLAGS = \ @@ -17,8 +14,7 @@ ftrtec_gateway_service_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/FtRtEvent/Utils ftrtec_gateway_service_SOURCES = \ @@ -28,19 +24,20 @@ ftrtec_gateway_service_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA -endif BUILD_ACE_UUID ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp index 83df60813d3..c1c9cec8356 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp @@ -12,10 +12,10 @@ //============================================================================= #include "FT_DefaultFaultAnalyzer.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/FT_NotifierC.h" -#include "orbsvcs/FT_FaultDetectorFactoryC.h" -#include "orbsvcs/FT_ReplicationManagerC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/FT_NotifierC.h" +#include "orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h" +#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h" #include "orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h index 814162e6662..ccf11188739 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "FT_ReplicationManagerLib_export.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" namespace TAO { diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp index 2464d558f1a..68c97c8833e 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp @@ -17,7 +17,7 @@ //============================================================================= #include "FT_FaultConsumer.h" -#include "orbsvcs/FT_ReplicationManagerC.h" +#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h" #include "orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h index 4ce246a321a..38bf8e8b347 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h @@ -22,8 +22,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyCommS.h" -#include "orbsvcs/FT_NotifierC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommS.h" +#include "orbsvcs/orbsvcs/FT_NotifierC.h" #include "FT_ReplicationManagerLib_export.h" namespace TAO diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h index d0b64b49e4f..2c8ce6cb62d 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h @@ -22,8 +22,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/FT_CORBAC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/FT_CORBAC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "FT_ReplicationManagerLib_export.h" namespace TAO diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp index 205f9f96d63..e2df60d3357 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp @@ -1,6 +1,6 @@ #include "FT_Property_Validator.h" -#include "orbsvcs/PortableGroup/PG_Operators.h" -#include "orbsvcs/FT_ReplicationManagerC.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h" +#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h" ACE_RCSID (PortableGroup, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h index cc5912f9b36..6b389719098 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h @@ -15,8 +15,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/PG_Default_Property_Validator.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index b0e7514c829..28e2ebd144a 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -22,13 +22,13 @@ #include "tao/IORTable/IORTable.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" -#include "orbsvcs/PortableGroup/PG_Object_Group.h" -#include "orbsvcs/PortableGroup/PG_Property_Set.h" -#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" -#include "orbsvcs/PortableGroup/PG_Property_Utils.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" -#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h" ACE_RCSID (FT_ReplicationManager, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h index 3536274bd0d..dd8f18d4f50 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h @@ -22,16 +22,16 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include <orbsvcs/FT_ReplicationManagerS.h> +#include <orbsvcs/orbsvcs/FT_ReplicationManagerS.h> //#include <orbsvcs/PortableGroup/PG_PropertyManager.h> //#include <orbsvcs/PortableGroup/PG_GenericFactory.h> //#include <orbsvcs/PortableGroup/PG_ObjectGroupManager.h> // Note: the new, improved versions... //#include <orbsvcs/PortableGroup/PG_Object_Group_Map.h> -#include <orbsvcs/PortableGroup/PG_Properties_Support.h> -#include <orbsvcs/PortableGroup/PG_Group_Factory.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h> -#include <orbsvcs/PortableGroup/PG_FactoryRegistry.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h> #include <orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h> diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc index dfd27e69fe0..c8b0643d09c 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc @@ -1,7 +1,8 @@ // $Id$ -project(*Lib): orbsvcslib, core, fault_tolerance, notification_skel, ftorb, portablegroup, minimum_corba { +project(*Lib): orbsvcslib, core, notification, fault_tolerance, ftorb, portablegroup { sharedname = TAO_ReplicationManagerLib dynamicflags = TAO_REPLICATIONMANAGERLIB_BUILD_DLL + avoids += minimum_corba Source_Files { FT_FaultAnalyzer.cpp @@ -11,7 +12,7 @@ project(*Lib): orbsvcslib, core, fault_tolerance, notification_skel, ftorb, port } } -project : taoserver, orbsvcsexe, fault_tolerance, notification_skel, iormanip, iortable, ftorb { +project : taoserver, orbsvcsexe, fault_tolerance, iormanip, ftorb { exename = FT_ReplicationManager libs += TAO_ReplicationManagerLib after += FT_ReplicationManager_Lib diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp index ecce2c241ae..326235cde9c 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp @@ -12,13 +12,13 @@ //============================================================================= #include "FT_ReplicationManagerFaultAnalyzer.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/FT_NotifierC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/FT_NotifierC.h" #include "orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h" #include "orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h" -#include "orbsvcs/PortableGroup/PG_Property_Utils.h" -#include "orbsvcs/PortableGroup/PG_Operators.h" -#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "tao/debug.h" #include <iostream> diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h index f15238af5bf..1149c2e149f 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h @@ -24,7 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h" -#include "orbsvcs/FT_CORBAC.h" +#include "orbsvcs/orbsvcs/FT_CORBAC.h" // Forward declarations. template <class T> class ACE_Unbounded_Set; diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am index c033916bcff..e7b4181ac89 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am +++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am @@ -7,9 +7,6 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.FT_ReplicationManager_Lib.am -if BUILD_ACE_UUID -if !BUILD_MINIMUM_CORBA - lib_LTLIBRARIES = libTAO_ReplicationManagerLib.la libTAO_ReplicationManagerLib_la_CPPFLAGS = \ @@ -17,16 +14,14 @@ libTAO_ReplicationManagerLib_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ + -I$(TAO_ROOT)/orbsvcs/orbsvcs \ -DTAO_REPLICATIONMANAGERLIB_BUILD_DLL libTAO_ReplicationManagerLib_la_SOURCES = \ - FT_DefaultFaultAnalyzer.cpp \ FT_FaultAnalyzer.cpp \ - FT_FaultConsumer.cpp \ - FT_FaultEventDescriptor.cpp + FT_DefaultFaultAnalyzer.cpp \ + FT_FaultEventDescriptor.cpp \ + FT_FaultConsumer.cpp libTAO_ReplicationManagerLib_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @@ -38,29 +33,29 @@ libTAO_ReplicationManagerLib_la_LIBADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la noinst_HEADERS = \ - FT_DefaultFaultAnalyzer.h \ FT_FaultAnalyzer.h \ - FT_FaultConsumer.h \ - FT_FaultEventDescriptor.h + FT_FaultEventDescriptor.h \ + FT_DefaultFaultAnalyzer.h \ + FT_FaultConsumer.h -endif !BUILD_MINIMUM_CORBA -endif BUILD_ACE_UUID ## Makefile.FT_ReplicationManager.am -if BUILD_ACE_UUID -if !BUILD_MINIMUM_CORBA - noinst_PROGRAMS = FT_ReplicationManager FT_ReplicationManager_CPPFLAGS = \ @@ -68,43 +63,40 @@ FT_ReplicationManager_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL + -I$(TAO_ROOT)/orbsvcs/orbsvcs FT_ReplicationManager_SOURCES = \ - FT_Property_Validator.cpp \ FT_ReplicationManager.cpp \ - FT_ReplicationManagerFaultAnalyzer.cpp \ FT_ReplicationManager_Main.cpp \ - FT_Property_Validator.h \ - FT_ReplicationManager.h \ - FT_ReplicationManagerFaultAnalyzer.h + FT_Property_Validator.cpp \ + FT_ReplicationManagerFaultAnalyzer.cpp FT_ReplicationManager_LDADD = \ - libTAO_ReplicationManagerLib.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_MINIMUM_CORBA -endif BUILD_ACE_UUID + libTAO_ReplicationManagerLib.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +noinst_HEADERS += \ + FT_ReplicationManagerFaultAnalyzer.h \ + FT_Property_Validator.h \ + FT_ReplicationManager.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp index ef7637ddf64..30ba12055a6 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -14,8 +14,8 @@ #include "Fault_Detector_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/PortableGroup/PG_Property_Set.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h" // Use this macro at the beginning of CORBA methods // to aid in debugging. diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h index ec7dd75f590..c9d5b8e6398 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h @@ -32,8 +32,8 @@ namespace TAO ///////////////////////////////// // Includes needed by this header #include <ace/Vector_T.h> -#include <orbsvcs/FT_FaultDetectorFactoryS.h> -#include <orbsvcs/FT_ReplicationManagerC.h> +#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryS.h> +#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h> #include <ace/Thread_Manager.h> ///////////////////// diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h index d5882ad1a15..9f5d76029cf 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h @@ -36,8 +36,8 @@ namespace TAO } -#include "orbsvcs/FT_NotifierC.h" -#include "orbsvcs/FT_ReplicaC.h" +#include "orbsvcs/orbsvcs/FT_NotifierC.h" +#include "orbsvcs/orbsvcs/FT_ReplicaC.h" #include "ace/Time_Value.h" diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am index f61903d0926..cb913c06ab4 100644 --- a/TAO/orbsvcs/Fault_Detector/Makefile.am +++ b/TAO/orbsvcs/Fault_Detector/Makefile.am @@ -7,9 +7,6 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Fault_Detector.am -if BUILD_ACE_UUID -if !BUILD_MINIMUM_CORBA - noinst_PROGRAMS = Fault_Detector Fault_Detector_CPPFLAGS = \ @@ -17,16 +14,12 @@ Fault_Detector_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL + -I$(TAO_ROOT)/orbsvcs/orbsvcs Fault_Detector_SOURCES = \ - FT_FaultDetectorFactory_i.cpp \ - Fault_Detector_Main.cpp \ Fault_Detector_i.cpp \ - FT_FaultDetectorFactory_i.h \ - Fault_Detector_i.h + Fault_Detector_Main.cpp \ + FT_FaultDetectorFactory_i.cpp Fault_Detector_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ @@ -35,17 +28,23 @@ Fault_Detector_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA -endif BUILD_ACE_UUID +noinst_HEADERS = \ + FT_FaultDetectorFactory_i.h \ + Fault_Detector_i.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h index ab820df236c..5f3e11e20d8 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h @@ -34,9 +34,9 @@ namespace TAO } -#include <orbsvcs/FT_NotifierS.h> -#include <orbsvcs/FT_ReplicationManagerC.h> -#include <orbsvcs/Notify/Notify_EventChannelFactory_i.h> +#include <orbsvcs/orbsvcs/FT_NotifierS.h> +#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h> +#include <orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h> #include <ace/Vector_T.h> ///////////////////// diff --git a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc index ae081aaa722..5f079ce6c8a 100644 --- a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc +++ b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc @@ -1,5 +1,5 @@ // $Id$ -project : taoserver, orbsvcsexe, fault_tolerance, notification_serv { +project : taoserver, orbsvcsexe, fault_tolerance, notification { exename = Fault_Notifier Source_Files { FT_Notifier_i.cpp diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am index 68c4b852343..c941b54cb4e 100644 --- a/TAO/orbsvcs/Fault_Notifier/Makefile.am +++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am @@ -7,9 +7,6 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Fault_Notifier.am -if BUILD_ACE_UUID -if !BUILD_MINIMUM_CORBA - noinst_PROGRAMS = Fault_Notifier Fault_Notifier_CPPFLAGS = \ @@ -17,40 +14,35 @@ Fault_Notifier_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL + -I$(TAO_ROOT)/orbsvcs/orbsvcs Fault_Notifier_SOURCES = \ FT_Notifier_i.cpp \ - Fault_Notifier_Main.cpp \ - FT_Notifier_i.h + Fault_Notifier_Main.cpp Fault_Notifier_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA -endif BUILD_ACE_UUID +noinst_HEADERS = \ + FT_Notifier_i.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp index f598d35bb93..4ce922eda83 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp @@ -2,11 +2,11 @@ // $Id$ #include "IFR_Service.h" -#include "orbsvcs/IFRService/ComponentRepository_i.h" -#include "orbsvcs/IFRService/Options.h" -#include "orbsvcs/IFRService/IFR_ComponentsS.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" -#include "orbsvcs/IOR_Multicast.h" +#include "orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h" +#include "orbsvcs/orbsvcs/IFRService/Options.h" +#include "orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h" +#include "orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/orbsvcs/IOR_Multicast.h" #include "tao/IORTable/IORTable.h" #include "tao/ORB_Core.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h index 566eec1207a..a66487d1896 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.h +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h @@ -17,7 +17,7 @@ #define IFR_SERVICE_H #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h" #include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am index 4e6b40c3a68..ef0f466d495 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.am +++ b/TAO/orbsvcs/IFR_Service/Makefile.am @@ -7,39 +7,36 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.IFR_Service.am -if !BUILD_MINIMUM_CORBA - -bin_PROGRAMS = IFR_Service +noinst_PROGRAMS = IFR_Service IFR_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR) IFR_Service_SOURCES = \ IFR_Server.cpp \ - IFR_Service.cpp \ - IFR_Service.h + IFR_Service.cpp IFR_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_IFRService.la \ - $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_IFRService.la \ + $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +noinst_HEADERS = \ + IFR_Service.h ## Makefile.TAO_IFR_BE.am -if !BUILD_MINIMUM_CORBA - lib_LTLIBRARIES = libTAO_IFR_BE.la libTAO_IFR_BE_la_CPPFLAGS = \ @@ -67,29 +64,26 @@ libTAO_IFR_BE_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IFR_BE_la_LIBADD = \ - $(TAO_BUILDDIR)/TAO_IDL/libTAO_IDL_FE.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(TAO_BUILDDIR)/TAO_IDL/libTAO_IDL_FE.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ +noinst_HEADERS += \ be_extern.h \ be_global.h \ - ifr_adding_visitor.h \ + ifr_adding_visitor_union.h \ ifr_adding_visitor_exception.h \ - ifr_adding_visitor_operation.h \ ifr_adding_visitor_structure.h \ - ifr_adding_visitor_union.h \ - ifr_removing_visitor.h \ - ifr_visitor.h + ifr_adding_visitor_operation.h \ + ifr_adding_visitor.h \ + ifr_visitor.h \ + ifr_removing_visitor.h -endif !BUILD_MINIMUM_CORBA ## Makefile.TAO_IFR_EXE.am -if !BUILD_MINIMUM_CORBA - -bin_PROGRAMS += tao_ifr +bin_PROGRAMS = tao_ifr tao_ifr_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -103,8 +97,7 @@ tao_ifr_CPPFLAGS = \ tao_ifr_SOURCES = \ $(TAO_ROOT)/TAO_IDL/driver/drv_args.cpp \ $(TAO_ROOT)/TAO_IDL/driver/drv_preproc.cpp \ - $(TAO_ROOT)/TAO_IDL/tao_idl.cpp \ - $(TAO_ROOT)/TAO_IDL/include/drv_extern.h + $(TAO_ROOT)/TAO_IDL/tao_idl.cpp tao_ifr_LDADD = \ libTAO_IFR_BE.la \ @@ -113,7 +106,8 @@ tao_ifr_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +noinst_HEADERS += \ + $(TAO_ROOT)/TAO_IDL/include/drv_extern.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h index 71e5dd3eab4..ba73720cb32 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h @@ -17,7 +17,7 @@ #include "Server_Repository.h" -#include "orbsvcs/IOR_Multicast.h" +#include "orbsvcs/orbsvcs/IOR_Multicast.h" #include "tao/PortableServer/ImplRepoS.h" #include "tao/IORTable/IORTable.h" diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index f2971a7fbc5..fa08b1b2df3 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -7,7 +7,7 @@ #include "INS_Locator.h" #include "Adapter_Activator.h" -#include "orbsvcs/IOR_Multicast.h" +#include "orbsvcs/orbsvcs/IOR_Multicast.h" #include "tao/IORTable/IORTable.h" #include "tao/PortableServer/POA.h" diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index 39f5d0f11fb..c36d04a647e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -31,7 +31,6 @@ project(ImR_Activator) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, ior project(tao_imr) : orbsvcsexe, core, acexml, minimum_corba, svc_utils, iortable { exename = tao_imr - install = $(ACE_ROOT)/bin Source_Files { tao_imr.cpp tao_imr_i.cpp diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h index d170b8fdca1..6551226a03b 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h @@ -14,8 +14,8 @@ // ============================================================================ -#include "orbsvcs/CosLifeCycleC.h" -#include "orbsvcs/LifeCycleServiceC.h" +#include "orbsvcs/orbsvcs/CosLifeCycleC.h" +#include "orbsvcs/orbsvcs/LifeCycleServiceC.h" #ifndef CRITERIA_EVALUATOR_H_H #define CRITERIA_EVALUATOR_H_H diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp index f088231c4f2..9fd155d9179 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp @@ -20,7 +20,7 @@ // ============================================================================ #include "Factory_Trader.h" -#include "orbsvcs/CosTradingC.h" +#include "orbsvcs/orbsvcs/CosTradingC.h" ACE_RCSID (LifeCycle_Service, Factory_Trader, diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h index ebf8a024d32..5a42d04a3cb 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h @@ -17,9 +17,9 @@ #ifndef FACTORY_TRADER_H #define FACTORY_TRADER_H -#include "orbsvcs/Trader/Trader.h" -#include "orbsvcs/Trader/Service_Type_Repository.h" -#include "orbsvcs/CosLifeCycleC.h" +#include "orbsvcs/orbsvcs/Trader/Trader.h" +#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/orbsvcs/CosLifeCycleC.h" class Factory_Trader diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc index 1375457f260..ce6a8681ac2 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc @@ -1,6 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, lifecycle, naming, trading_serv, minimum_corba { +project : orbsvcsexe, core, lifecycle, naming, trading { + avoids += minimum_corba exename = LifeCycle_Service } diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp index a1e011451b8..b0a3411bbaa 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp @@ -15,7 +15,7 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/LifeCycleServiceC.h" +#include "orbsvcs/orbsvcs/LifeCycleServiceC.h" #include "LifeCycle_Service_i.h" diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h index 2997da242a5..562d97451de 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h @@ -13,7 +13,7 @@ // // ============================================================================ -#include "orbsvcs/LifeCycleServiceS.h" +#include "orbsvcs/orbsvcs/LifeCycleServiceS.h" #include "Factory_Trader.h" #include "Criteria_Evaluator.h" diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am index 1583bc278c8..b1ca8c9c112 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am +++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am @@ -7,41 +7,41 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.LifeCycle_Service.am -if !BUILD_MINIMUM_CORBA - -bin_PROGRAMS = LifeCycle_Service +noinst_PROGRAMS = LifeCycle_Service LifeCycle_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_ROOT)/orbsvcs/orbsvcs LifeCycle_Service_SOURCES = \ - Criteria_Evaluator.cpp \ Factory_Trader.cpp \ + Criteria_Evaluator.cpp \ LifeCycle_Service.cpp \ - LifeCycle_Service_i.cpp \ - Criteria_Evaluator.h \ - Factory_Trader.h \ - LifeCycle_Service.h \ - LifeCycle_Service_i.h + LifeCycle_Service_i.cpp LifeCycle_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_MINIMUM_CORBA + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLifeCycle.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +noinst_HEADERS = \ + LifeCycle_Service_i.h \ + Factory_Trader.h \ + Criteria_Evaluator.h \ + LifeCycle_Service.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc index 2574a799cfd..1528d5321b4 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc +++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc @@ -1,10 +1,7 @@ // -*- MPC -*- -// // $Id$ - -project(LoadManager): namingexe, portableserver, core, iortable, iormanip, loadbalancing { - exename = LoadManager +project(CosLoadManager): namingexe, portableserver, core, iormanip, loadbalancing { requires += ami interceptors Source_Files { LoadManager.cpp @@ -12,9 +9,8 @@ project(LoadManager): namingexe, portableserver, core, iortable, iormanip, loadb } } -project(LoadMonitor): namingexe, portableserver, core, loadbalancing { +project(CosLoadMonitor): namingexe, portableserver, core, loadbalancing { requires += ami interceptors - exename = LoadMonitor Source_Files { LoadMonitor.cpp Push_Handler.cpp diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp index c1976869d18..e554d610122 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp @@ -1,6 +1,6 @@ #include "Signal_Handler.h" -#include "orbsvcs/LoadBalancing/LB_LoadManager.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp index f358baac632..aaadc7a2e05 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp @@ -1,8 +1,8 @@ #include "Push_Handler.h" #include "Monitor_Signal_Handler.h" -#include "orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h" -#include "orbsvcs/LoadBalancing/LB_conf.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LB_conf.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.am b/TAO/orbsvcs/LoadBalancer/Makefile.am index ab6a73c5bef..41c2fd88751 100644 --- a/TAO/orbsvcs/LoadBalancer/Makefile.am +++ b/TAO/orbsvcs/LoadBalancer/Makefile.am @@ -5,86 +5,75 @@ ACE_BUILDDIR = $(top_builddir)/.. TAO_ROOT = $(top_srcdir) TAO_BUILDDIR = $(top_builddir) -## Makefile.LoadManager.am +## Makefile.CosLoadManager.am -if BUILD_AMI -if BUILD_INTERCEPTORS -if !BUILD_MINIMUM_CORBA - -bin_PROGRAMS = LoadManager +noinst_PROGRAMS = LoadManager LoadManager_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_ROOT)/orbsvcs/orbsvcs LoadManager_SOURCES = \ LoadManager.cpp \ - Signal_Handler.cpp \ - Signal_Handler.h + Signal_Handler.cpp LoadManager_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_MINIMUM_CORBA -endif BUILD_INTERCEPTORS -endif BUILD_AMI - -## Makefile.LoadMonitor.am + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +noinst_HEADERS = \ + Signal_Handler.h -if BUILD_AMI -if BUILD_INTERCEPTORS -if !BUILD_MINIMUM_CORBA +## Makefile.CosLoadMonitor.am -bin_PROGRAMS += LoadMonitor +noinst_PROGRAMS += LoadMonitor LoadMonitor_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_ROOT)/orbsvcs/orbsvcs LoadMonitor_SOURCES = \ LoadMonitor.cpp \ - Monitor_Signal_Handler.cpp \ Push_Handler.cpp \ - Signal_Handler.cpp \ - Monitor_Signal_Handler.h \ - Push_Handler.h \ - Signal_Handler.h + Monitor_Signal_Handler.cpp \ + Signal_Handler.cpp LoadMonitor_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_MINIMUM_CORBA -endif BUILD_INTERCEPTORS -endif BUILD_AMI + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +noinst_HEADERS += \ + Push_Handler.h \ + Signal_Handler.h \ + Monitor_Signal_Handler.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h index aee41ca5e76..97d44eeb471 100644 --- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h +++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h @@ -20,7 +20,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" /** diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.h b/TAO/orbsvcs/LoadBalancer/Push_Handler.h index 7913a399f72..1faa67aaf3b 100644 --- a/TAO/orbsvcs/LoadBalancer/Push_Handler.h +++ b/TAO/orbsvcs/LoadBalancer/Push_Handler.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #include "ace/Event_Handler.h" diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc index ad5e1e76b66..8f5d3c09116 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc @@ -1,5 +1,4 @@ // $Id$ -project: namingexe, core, dslogadmin_serv { - exename = Basic_Logging_Service +project: namingexe, dslogadmin { includes += $(TAO_ROOT)/orbsvcs } diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am index 66f65eb0284..2bfd1e99121 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am @@ -7,7 +7,7 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Basic_Logging_Service.am -bin_PROGRAMS = Basic_Logging_Service +noinst_PROGRAMS = Basic_Logging_Service Basic_Logging_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -15,23 +15,30 @@ Basic_Logging_Service_CPPFLAGS = \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs/orbsvcs Basic_Logging_Service_SOURCES = \ - Basic_Logging_Service.cpp \ - Basic_Logging_Service.h + Basic_Logging_Service.cpp Basic_Logging_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +noinst_HEADERS = \ + Basic_Logging_Service.h + ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc index 2fef8068b7e..3ad79188922 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc @@ -1,5 +1,4 @@ // $Id$ -project: namingexe, core, dseventlogadmin_serv { - exename = Event_Logging_Service +project: namingexe, dseventlogadmin { includes += $(TAO_ROOT)/orbsvcs } diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am index a827aca7cb3..be54683a0b2 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am @@ -7,45 +7,42 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Event_Logging_Service.am -if !BUILD_MINIMUM_CORBA - -bin_PROGRAMS = Event_Logging_Service +noinst_PROGRAMS = Event_Logging_Service Event_Logging_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL - + Event_Logging_Service_SOURCES = \ - Event_Logging_Service.cpp \ - Event_Logging_Service.h + Event_Logging_Service.cpp Event_Logging_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +noinst_HEADERS = \ + Event_Logging_Service.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am index 14d699263cd..8d9d161d35a 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am @@ -7,46 +7,45 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Notify_Logging_Service.am -if !BUILD_MINIMUM_CORBA - -bin_PROGRAMS = Notify_Logging_Service +noinst_PROGRAMS = Notify_Logging_Service Notify_Logging_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs \ + -I$(TAO_ROOT)/orbsvcs/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL Notify_Logging_Service_SOURCES = \ Notify_Logging_Server.cpp \ - Notify_Logging_Service.cpp \ - Notify_Logging_Service.h + Notify_Logging_Service.cpp Notify_Logging_Service_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +noinst_HEADERS = \ + Notify_Logging_Service.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc index 471c70f9582..ea990697888 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc @@ -1,5 +1,5 @@ // $Id$ -project: namingexe, core, dsnotifylogadmin_serv, iortable { +project: namingexe, dsnotifylogadmin { exename = Notify_Logging_Service includes += $(TAO_ROOT)/orbsvcs } diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am index 9274beeb8c5..8ee3233f598 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am @@ -7,37 +7,41 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.RTEvent_Logging_Service.am -bin_PROGRAMS = RTEvent_Logging_Service +noinst_PROGRAMS = RTEvent_Logging_Service RTEvent_Logging_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ + -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_ROOT)/orbsvcs/orbsvcs RTEvent_Logging_Service_SOURCES = \ - RTEvent_Logging_Service.cpp \ - RTEvent_Logging_Service.h + RTEvent_Logging_Service.cpp RTEvent_Logging_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTOLDEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +noinst_HEADERS = \ + RTEvent_Logging_Service.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h index 857dd4983a2..87ea7bcd04f 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h @@ -25,7 +25,7 @@ #include "orbsvcs/Log/RTEventLogFactory_i.h" #include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/Naming_Client.h" +#include "orbsvcs/Naming/Naming_Utils.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc index 45f99a3790b..3756a9e0726 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc @@ -1,5 +1,4 @@ // $Id$ -project: namingexe, core, rteventlogadmin { - exename = RTEvent_Logging_Service +project: namingexe, rteventlogadmin { includes += $(TAO_ROOT)/orbsvcs } diff --git a/TAO/orbsvcs/Makefile.am b/TAO/orbsvcs/Makefile.am index ef7a917070c..3e864f17887 100644 --- a/TAO/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/Makefile.am @@ -24,8 +24,9 @@ SUBDIRS += \ Event_Service \ Dump_Schedule \ CosEvent_Service \ - Concurrency_Service \ - performance-tests \ - tests + Concurrency_Service +# +# performance-tests \ +# tests \ # examples diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am index e2c02543132..aeee835b58d 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile.am +++ b/TAO/orbsvcs/Naming_Service/Makefile.am @@ -7,64 +7,66 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.NT_Naming_Service.am -bin_PROGRAMS = NT_Naming_Service +noinst_PROGRAMS = NT_Naming_Service NT_Naming_Service_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs/orbsvcs NT_Naming_Service_SOURCES = \ - NT_Naming_Server.cpp \ - NT_Naming_Service.cpp \ Naming_Service.cpp \ - NT_Naming_Service.h \ - Naming_Service.h + NT_Naming_Server.cpp \ + NT_Naming_Service.cpp NT_Naming_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +noinst_HEADERS = \ + NT_Naming_Service.h \ + Naming_Service.h + ## Makefile.Naming_Service.am -bin_PROGRAMS += Naming_Service +noinst_PROGRAMS += Naming_Service Naming_Service_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(TAO_ROOT)/orbsvcs/orbsvcs Naming_Service_SOURCES = \ Naming_Server.cpp \ - Naming_Service.cpp \ - Naming_Service.h + Naming_Service.cpp Naming_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +noinst_HEADERS += \ + Naming_Service.h + ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp index 9dd785b891e..a16d6d434dc 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp @@ -3,34 +3,6 @@ #include "Naming_Service.h" #include "ace/OS_main.h" -#include <orbsvcs/Shutdown_Utilities.h> -#include <tao/debug.h> - -class Naming_Svc_Shutdown : public Shutdown_Functor -{ -public: - Naming_Svc_Shutdown(TAO_Naming_Service& ns); - - void operator() (int which_signal); -private: - TAO_Naming_Service& ns_; -}; - -Naming_Svc_Shutdown::Naming_Svc_Shutdown (TAO_Naming_Service &ns) - : ns_(ns) -{ -} - -void -Naming_Svc_Shutdown::operator() (int which_signal) -{ - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Name Service: shutting down on signal %d\n", - which_signal)); - (void) this->ns_.shutdown (); -} - // Driver function for the TAO Naming Service. int @@ -38,10 +10,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { TAO_Naming_Service naming_service; - // Stuff to insure that we're gracefully shut down... - Naming_Svc_Shutdown killer (naming_service); - Service_Shutdown kill_contractor(killer); - if (naming_service.init (argc, argv) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT("Failed to start the Naming Service.\n")), @@ -61,7 +29,5 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_ENDTRY; ACE_CHECK_RETURN (1); - naming_service.fini (); - return 0; } diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp index 1d57246d2f1..5cbe18e4aae 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp @@ -122,35 +122,6 @@ TAO_Naming_Service::run (ACE_ENV_SINGLE_ARG_DECL) return 0; } -void -TAO_Naming_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) -{ - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -int -TAO_Naming_Service::fini (void) -{ - ACE_DECLARE_NEW_CORBA_ENV; - - this->my_naming_server_.fini(); - - ACE_TRY - { - // destroy implies shutdown - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Service::fini"); - return -1; - } - ACE_ENDTRY; - return 0; -} - // Destructor. TAO_Naming_Service::~TAO_Naming_Service (void) { diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h index b2326ebabab..8bcbfcecf2d 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h @@ -21,7 +21,7 @@ #define TAO_NAMING_SERVICE_H #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/Naming/Naming_Server.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" class TAO_Naming_Service { @@ -42,15 +42,9 @@ public: virtual int init (int argc, ACE_TCHAR* argv[]); // Initialize the Naming Service with the arguments. - virtual int fini (void); - // The opposite of init(). - int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Run the TAO_Naming_Service. - void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - // Shut down the TAO_Naming_Service; you must still call fini(). - virtual ~TAO_Naming_Service (void); // Destructor. diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc index 7a96a9e6d25..ff877b2864f 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, naming_serv { +project : orbsvcsexe, core, naming { exename = Naming_Service Source_Files { Naming_Server.cpp @@ -9,7 +9,7 @@ project : orbsvcsexe, core, naming_serv { } } -project(NT_Naming_Service) : orbsvcsexe, core, naming_serv { +project(NT_Naming_Service) : orbsvcsexe, core, naming { exename = NT_Naming_Service Source_Files { Naming_Service.cpp diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am index 0ceeaa1e7f7..6a9f26b8679 100644 --- a/TAO/orbsvcs/Notify_Service/Makefile.am +++ b/TAO/orbsvcs/Notify_Service/Makefile.am @@ -7,85 +7,71 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.NT_Notify_Service.am -if !BUILD_MINIMUM_CORBA - -bin_PROGRAMS = NT_Notify_Service +noinst_PROGRAMS = NT_Notify_Service NT_Notify_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL + -I$(TAO_ROOT)/orbsvcs/orbsvcs NT_Notify_Service_SOURCES = \ - NT_Notify_Server.cpp \ - NT_Notify_Service.cpp \ Notify_Service.cpp \ - NT_Notify_Service.h \ - Notify_Service.h + NT_Notify_Server.cpp \ + NT_Notify_Service.cpp NT_Notify_Service_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +noinst_HEADERS = \ + Notify_Service.h \ + NT_Notify_Service.h ## Makefile.Notify_Service.am -if !BUILD_MINIMUM_CORBA - -bin_PROGRAMS += Notify_Service +noinst_PROGRAMS += Notify_Service Notify_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL + -I$(TAO_ROOT)/orbsvcs/orbsvcs Notify_Service_SOURCES = \ Notify_Server.cpp \ - Notify_Service.cpp \ - Notify_Service.h + Notify_Service.cpp Notify_Service_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +noinst_HEADERS += \ + Notify_Service.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h index e0de0ef0a8e..52af603fc0b 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.h +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h @@ -20,8 +20,8 @@ #include "ace/Task.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "../orbsvcs/Notify/CosNotify_Initializer.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc index 61fa82afa05..69a9fe56a6b 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, notification_serv, naming, iortable { +project : orbsvcsexe, core, notification, naming { exename = Notify_Service Source_Files { Notify_Server.cpp @@ -12,7 +12,7 @@ project : orbsvcsexe, core, notification_serv, naming, iortable { } } -project(NT_Notify_Service) : orbsvcsexe, core, notification_serv, naming, iortable { +project(NT_Notify_Service) : orbsvcsexe, core, notification, naming { exename = NT_Notify_Service Source_Files { Notify_Service.cpp diff --git a/TAO/orbsvcs/PSS/PSDL_Scope.cpp b/TAO/orbsvcs/PSS/PSDL_Scope.cpp index 2ebf0c03022..0f4815208ed 100644 --- a/TAO/orbsvcs/PSS/PSDL_Scope.cpp +++ b/TAO/orbsvcs/PSS/PSDL_Scope.cpp @@ -43,7 +43,7 @@ TAO_PSDL_Scope::to_lower_case (ACE_CString &identifier) size_t len = identifier.length (); for (size_t i = 0; i <= len; ++i) { - identifier[i] = ACE_OS::ace_tolower (identifier[i]); + identifier[i] = ACE_OS::to_lower (identifier[i]); } } diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am index 6eb147f68f8..503520aaf4a 100644 --- a/TAO/orbsvcs/Scheduling_Service/Makefile.am +++ b/TAO/orbsvcs/Scheduling_Service/Makefile.am @@ -7,29 +7,34 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Scheduling_Service.am -bin_PROGRAMS = Scheduling_Service +noinst_PROGRAMS = Scheduling_Service Scheduling_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_ROOT)/orbsvcs/orbsvcs Scheduling_Service_SOURCES = \ - Scheduling_Service.cpp \ - Scheduling_Service.h + Scheduling_Service.cpp Scheduling_Service_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +noinst_HEADERS = \ + Scheduling_Service.h + ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp index 3da4c4e1039..a071c1b0fc1 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp @@ -5,7 +5,7 @@ #include "ace/Get_Opt.h" #include "ace/Auto_Ptr.h" #include "ace/Argv_Type_Converter.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_main.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h index e76f5c63b15..2ed1d8f10f8 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h @@ -26,11 +26,11 @@ #define TAO_SCHEDULING_SERVICE_H #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/Sched/Reconfig_Scheduler.h" +#include "orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h" #if defined (TAO_USES_STRATEGY_SCHEDULER) -#include "orbsvcs/Sched/Strategy_Scheduler.h" +#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h" #endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */ -#include "orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" #include "ace/SString.h" class TAO_Scheduling_Service diff --git a/TAO/orbsvcs/TAO_Service/svc.conf b/TAO/orbsvcs/TAO_Service/svc.conf index 6168a3a624d..94d84ad5d3d 100644 --- a/TAO/orbsvcs/TAO_Service/svc.conf +++ b/TAO/orbsvcs/TAO_Service/svc.conf @@ -1,14 +1,14 @@ # Dynamically configure the naming service into the application process. -#dynamic TAO_Naming_Loader Service_Object * TAO_CosNaming_Serv:_make_TAO_Naming_Loader () "dummy -o ns.ior" +#dynamic TAO_Naming_Loader Service_Object * TAO_CosNaming:_make_TAO_Naming_Loader () "dummy -o ns.ior" # Dynamically configure the default Event Service Factory -#dynamic CEC_Factory Service_Object * TAO_CosEvent_Serv:_make_TAO_CEC_Default_Factory () "" +#dynamic CEC_Factory Service_Object * TAO_CosEvent:_make_TAO_CEC_Default_Factory () "" # Dynamically configure the naming service into the application process. -#dynamic TAO_CEC_Event_Loader Service_Object * TAO_CosEvent_Serv:_make_TAO_CEC_Event_Loader () "dummy -o foo.ref -x" +#dynamic TAO_CEC_Event_Loader Service_Object * TAO_CosEvent:_make_TAO_CEC_Event_Loader () "dummy -o foo.ref -x" # Dynamically configure the trading service into the application process. -#dynamic TAO_Trading_Loader Service_Object * TAO_CosTrading_Serv:_make_TAO_Trading_Loader () "dummy -TSdumpior footra.ref" +#dynamic TAO_Trading_Loader Service_Object * TAO_CosTrading:_make_TAO_Trading_Loader () "dummy -TSdumpior footra.ref" #Dynamically remove the trading service from the application process #remove TAO_Trading_Loader diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h index 78d4d7c61b0..6892d90987a 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.h +++ b/TAO/orbsvcs/Time_Service/Clerk_i.h @@ -20,9 +20,9 @@ #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/Naming_Server.h" -#include "orbsvcs/Time/TAO_Time_Service_Clerk.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h" class Clerk_i { diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am index c202120c147..987c518e5eb 100644 --- a/TAO/orbsvcs/Time_Service/Makefile.am +++ b/TAO/orbsvcs/Time_Service/Makefile.am @@ -7,64 +7,66 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Time_Service_Clerk.am -bin_PROGRAMS = Time_Service_Clerk +noinst_PROGRAMS = Time_Service_Clerk Time_Service_Clerk_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_ROOT)/orbsvcs/orbsvcs Time_Service_Clerk_SOURCES = \ Clerk_i.cpp \ - Time_Service_Clerk.cpp \ - Clerk_i.h + Time_Service_Clerk.cpp Time_Service_Clerk_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +noinst_HEADERS = \ + Clerk_i.h + ## Makefile.Time_Service_Server.am -bin_PROGRAMS += Time_Service_Server +noinst_PROGRAMS += Time_Service_Server Time_Service_Server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_ROOT)/orbsvcs/orbsvcs Time_Service_Server_SOURCES = \ Server_i.cpp \ - Time_Service_Server.cpp \ - Server_i.h + Time_Service_Server.cpp Time_Service_Server_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTime.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +noinst_HEADERS += \ + Server_i.h + ## Clean up template repositories, etc. clean-local: -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h index 70660377faf..6cc665c12ed 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.h +++ b/TAO/orbsvcs/Time_Service/Server_i.h @@ -20,9 +20,9 @@ #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/Naming_Server.h" -#include "orbsvcs/Time/TAO_Time_Service_Server.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h" class Server_i { diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc index 865cc01d9fc..a3e8eed4121 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service.mpc +++ b/TAO/orbsvcs/Time_Service/Time_Service.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Time_Service_Server) : orbsvcsexe, core, time, naming_serv { +project(Time_Service_Server) : orbsvcsexe, core, time { exename = Time_Service_Server Source_Files { Server_i.cpp @@ -9,7 +9,7 @@ project(Time_Service_Server) : orbsvcsexe, core, time, naming_serv { } } -project(Time_Service_Clerk) : orbsvcsexe, core, time, naming_serv { +project(Time_Service_Clerk) : orbsvcsexe, core, time { exename = Time_Service_Clerk Source_Files { Clerk_i.cpp diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am index 12056013012..866b0c34d69 100644 --- a/TAO/orbsvcs/Trading_Service/Makefile.am +++ b/TAO/orbsvcs/Trading_Service/Makefile.am @@ -7,31 +7,38 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.Trading_Service.am -bin_PROGRAMS = Trading_Service +noinst_PROGRAMS = Trading_Service Trading_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_ROOT)/orbsvcs/orbsvcs Trading_Service_SOURCES = \ Trading_Server.cpp \ - Trading_Service.cpp \ - Trading_Service.h + Trading_Service.cpp + +Trading_Service_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ Trading_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosTrading.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +noinst_HEADERS = \ + Trading_Service.h ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h index 55f5073f798..29d4bd2fef4 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.h +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h @@ -24,10 +24,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/IOR_Multicast.h" -#include "orbsvcs/Trader/Trader.h" -#include "orbsvcs/Trader/Service_Type_Repository.h" -#include "orbsvcs/Trader/Trading_Loader.h" +#include "orbsvcs/orbsvcs/IOR_Multicast.h" +#include "orbsvcs/orbsvcs/Trader/Trader.h" +#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/orbsvcs/Trader/Trading_Loader.h" class Trading_Service; diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc index 46950125c54..0bd2fdc6201 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, naming, trading_serv { +project : orbsvcsexe, core, naming, trading { exename = Trading_Service } diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc index a8ca4d25dab..9f36dda8a84 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc @@ -1,19 +1,16 @@ // -*- MPC -*- // $Id$ -project(*Client) : orbsvcsexe, event, event_skel, naming { +project(*Client) : orbsvcsexe, event { idlflags += -I ../../.. - exename = FactoryClient source_files { FactoryClient.cpp } } -project(*Server) : orbsvcsexe, event, event_serv, naming { +project(*Server) : orbsvcsexe, event { idlflags += -I ../../.. - exename = FactoryServer source_files { - main.cpp FactoryDriver.cpp CosEventChannelFactory_i.cpp } diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl index ffeff6c5f94..59446678f5a 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl @@ -36,7 +36,7 @@ #ifndef TAO_COSEVENTCHANNELFACTORY_IDL #define TAO_COSEVENTCHANNELFACTORY_IDL -#include "orbsvcs/CosEventChannelAdmin.idl" +#include "orbsvcs/orbsvcs/CosEventChannelAdmin.idl" module CosEventChannelFactory { diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp index 60210ad8515..c3661adf5eb 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp @@ -2,7 +2,7 @@ // $Id$ #include "CosEventChannelFactory_i.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" #include "tao/PortableServer/PortableServer.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h index 628383b8ed2..520fc37d382 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h @@ -23,7 +23,7 @@ #include /**/ "ace/pre.h" #include "CosEventChannelFactoryS.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp index 72c9ebc763b..2161591ffef 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp @@ -2,7 +2,7 @@ // $Id$ #include "CosEventChannelFactoryC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Log_Msg.h" class FactoryClient diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h index 97d837a7c2e..d60f76a6c68 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h @@ -22,7 +22,7 @@ #define TAO_FACTORYDRIVER_H #include "CosEventChannelFactory_i.h" -#include "orbsvcs/Naming/Naming_Client.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" // @@ Pradeep: I know this is just an example, but could you talk to // Vishal about making this a service that could be bootstraped diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc index 246f2e8cbd7..aa651b338c2 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc @@ -1,9 +1,9 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, rtevent, event, event_skel, naming { +project : orbsvcsexe, rtevent, event { after += CosEC_RtEC_Based_lib includes += ../lib libs += CosEC_RtEC_Based libpaths += ../lib -} +}
\ No newline at end of file diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp index 68f393240e7..aeb77be05a1 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp @@ -1,7 +1,7 @@ // $Id$ #include "RtEC_Based_CosEC.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" #include "ace/Get_Opt.h" RtEC_Based_CosEC::RtEC_Based_CosEC (void) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h index 72f1bd8224f..6a66feb0f76 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h @@ -17,7 +17,7 @@ #define RTEC_BASED_COSEC_H #include "CosEvent_Utilities.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #if defined (_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h index 5381540bb2c..22284842ca5 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h @@ -22,8 +22,8 @@ #define CONSUMERADMIN_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "ProxyPushSupplier_i.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc index 62ea3052326..28ddfc71428 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, event_skel, rtevent, rtsched { +project : orbsvcslib, event, rtevent, rtsched { sharedname = CosEC_RtEC_Based dynamicflags += TAO_RTEC_COSEC_BUILD_DLL } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp index 41da6bcd3b4..f2520c36c0b 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp @@ -2,8 +2,8 @@ // $Id$ #include "CosEvent_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "EventChannel_i.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h index a55db26014c..644d57fab98 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h @@ -21,10 +21,10 @@ #define TAO_COSEVENT_UTILITIES_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecBaseC.h" -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/RtecBaseC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "rtec_cosec_export.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h index 03b96d3847f..14ffd0da9f9 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h @@ -22,8 +22,8 @@ #define EVENTCHANNEL_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" #include "ConsumerAdmin_i.h" #include "SupplierAdmin_i.h" diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp index 73311b2af45..dfd35b67112 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp @@ -1,11 +1,11 @@ /* -*- C++ -*- */ // $Id$ -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/CosEventChannelAdminC.h" -#include "orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" #include "ProxyPushConsumer_i.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h index ce07097b36f..b8ae2bc3c36 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h @@ -22,8 +22,8 @@ #define _PROXYPUSHCONSUMER_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "rtec_cosec_export.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp index 52c99def13d..38fb66a0291 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp @@ -1,10 +1,10 @@ // $Id$ // -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/CosEventChannelAdminC.h" -#include "orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" #include "ProxyPushSupplier_i.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h index b1adfc0b0bc..ded678af2d4 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h @@ -22,8 +22,8 @@ #define _PROXYPUSHSUPPLIER_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" #include "rtec_cosec_export.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h index 30c3435bdef..0e2a79802c4 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h @@ -22,8 +22,8 @@ #define SUPPLIER_ADMIN_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" #include "ProxyPushConsumer_i.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h index c1ced5cbc08..f62fd70e6af 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h @@ -17,10 +17,10 @@ #ifndef COSECCONSUMER_H_ #define COSECCONSUMER_H_ -#include "orbsvcs/CosEventCommC.h" -#include "orbsvcs/CosEventChannelAdminC.h" -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventCommC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" class Consumer : public POA_CosEventComm::PushConsumer { diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc index 1cd65727ebb..89c0143b7cd 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Client) : orbsvcsexe, event, event_skel, rtevent, rtsched { +project(*Client) : orbsvcsexe, event, rtevent, rtsched { after += CosEC_RtEC_Based_lib includes += ../../lib libs += CosEC_RtEC_Based diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h index 413244fc4f4..7bd54f164de 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h @@ -17,10 +17,10 @@ #ifndef COSECSUPPLIER_H_ #define COSECSUPPLIER_H_ -#include "orbsvcs/CosEventCommC.h" -#include "orbsvcs/CosEventChannelAdminC.h" -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventCommC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" class Supplier : public POA_CosEventComm::PushSupplier { diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h index ce523fed960..0c547769e90 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h @@ -17,10 +17,10 @@ #ifndef COSECCONSUMER_H_ #define COSECCONSUMER_H_ -#include "orbsvcs/CosEventCommC.h" -#include "orbsvcs/CosEventChannelAdminC.h" -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventCommC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "Multiple.h" class Consumer : public POA_CosEventComm::PushConsumer, public Multiple diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc index 3018aa6b8df..ee8fe174725 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched { +project(*Cons) : orbsvcsexe, event, rtevent, rtsched { after += CosEC_RtEC_Based_lib includes += ../../lib libs += CosEC_RtEC_Based @@ -12,7 +12,7 @@ project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched { } } -project(*Supp) : orbsvcsexe, event, event_skel, rtevent, rtsched { +project(*Supp) : orbsvcsexe, event, rtevent, rtsched { after += CosEC_RtEC_Based_lib includes += ../../lib libs += CosEC_RtEC_Based diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h index 3248946ce78..883c5d20dcf 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h @@ -17,10 +17,9 @@ #ifndef COSECMULTIPLE_H #define COSECMULTIPLE_H -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/Naming/Naming_Server.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" class Multiple { diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h index 29b213cd31f..bcc3bf9f145 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h @@ -17,10 +17,10 @@ #ifndef COSECSUPPLIER_H_ #define COSECSUPPLIER_H_ -#include "orbsvcs/CosEventCommC.h" -#include "orbsvcs/CosEventChannelAdminC.h" -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventCommC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "Multiple.h" class Supplier : public POA_CosEventComm::PushSupplier, diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index 578cebcefd0..81d992eb24b 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" ACE_RCSID (CosEC_Examples, Consumer, diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h index 7156353e483..cf672b12d27 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h @@ -17,7 +17,7 @@ #ifndef CONSUMER_H #define CONSUMER_H -#include "orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc index 7a91454ad07..a423f5f1075 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc +++ b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc @@ -1,19 +1,19 @@ // -*- MPC -*- // $Id$ -project(*Service) : orbsvcsexe, event, event_serv, naming { +project(*Service) : orbsvcsexe, event { Source_Files { Service.cpp } } -project(*Consumer) : orbsvcsexe, event, event_skel { +project(*Consumer) : orbsvcsexe, event { Source_Files { Consumer.cpp } } -project(*Supplier) : orbsvcsexe, event, event_skel { +project(*Supplier) : orbsvcsexe, event { Source_Files { Supplier.cpp } diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp index f9fee3e6b0d..9dbb168736a 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp index 099735ce5f7..85d26f07d32 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (CosEC_Examples, diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h index 4fdc39bfa08..7771693bd2e 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h @@ -17,7 +17,7 @@ #ifndef SUPPLIER_H #define SUPPLIER_H -#include "orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp index b1858fb720a..aa6cea972e4 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/CosTypedEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminC.h" #include "Country_i.h" ACE_RCSID (CosEC_Examples, diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc index cddcd128801..d933c1610e7 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Consumer) : event_skel, orbsvcsexe, portableserver, naming { +project(*Consumer) : event, orbsvcsexe, portableserver { requires += ec_typed_events source_files { Consumer.cpp @@ -9,7 +9,7 @@ project(*Consumer) : event_skel, orbsvcsexe, portableserver, naming { } } -project(*Supplier) : event_skel, orbsvcsexe, portableserver, naming { +project(*Supplier) : event, orbsvcsexe, portableserver { requires += ec_typed_events after += CosEC_TypedSimple_Consumer idl_files { @@ -18,4 +18,4 @@ project(*Supplier) : event_skel, orbsvcsexe, portableserver, naming { CountryC.cpp Supplier.cpp } -} +}
\ No newline at end of file diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl index 77c68564272..124de09b122 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl @@ -5,7 +5,7 @@ #ifndef TAO_COUNTRY_IDL #define TAO_COUNTRY_IDL -#include "orbsvcs/CosTypedEventComm.idl" +#include "orbsvcs/orbsvcs/CosTypedEventComm.idl" #pragma prefix "jon.com" interface Country : ::CosTypedEventComm::TypedPushConsumer diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp index c908d935e80..176a2ecbc31 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/CosTypedEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminC.h" #include "CountryC.h" ACE_RCSID(CosEC_Examples, Supplier, "$Id:") diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h index b06ffc65f92..4e41cac3de1 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h @@ -17,8 +17,8 @@ #ifndef TLS_CLIENT_H #define TLS_CLIENT_H -#include "orbsvcs/DsLogAdminC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/DsLogAdminC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" class TLS_Client { diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index b8dc8157a18..357cced7a5d 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -1,5 +1,5 @@ #include "Event_Consumer.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_main.h" ACE_RCSID (Event, diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h index 946299dc55d..0f8339d9e11 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h @@ -17,9 +17,9 @@ #ifndef EVENT_CONSUMER_H #define EVENT_CONSUMER_H -#include "orbsvcs/DsEventLogAdminC.h" -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/DsEventLogAdminC.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp index 1fee4da0b1a..fc2d84cbe72 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp @@ -1,5 +1,5 @@ #include "Event_Supplier.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_main.h" ACE_RCSID (Event, diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h index c37b9a5c9df..4a66e3ab074 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h @@ -17,9 +17,9 @@ #ifndef EVENT_SUPPLIER_H #define EVENT_SUPPLIER_H -#include "orbsvcs/DsEventLogAdminC.h" -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/DsEventLogAdminC.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc b/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc index f58a5f29118..fb4ebd95b7e 100644 --- a/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc +++ b/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Consumer) : orbsvcsexe, dseventlogadmin, event_skel, naming { +project(*Consumer) : orbsvcsexe, event, dseventlogadmin { exename = consumer source_files { Event_Consumer.cpp } } -project(*Supplier) : orbsvcsexe, dseventlogadmin, event_skel, naming { +project(*Supplier) : orbsvcsexe, event, dseventlogadmin { exename = supplier source_files { Event_Supplier.cpp diff --git a/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc b/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc index 321de1e7566..74ebf988ce3 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc +++ b/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Consumer) : orbsvcsexe, dsnotifylogadmin, notification_skel, naming { +project(*Consumer) : orbsvcsexe, notification, dsnotifylogadmin, naming { exename = consumer source_files { Notify_Consumer.cpp } } -project(*Supplier) : orbsvcsexe, dsnotifylogadmin, notification_skel, naming { +project(*Supplier) : orbsvcsexe, notification, dsnotifylogadmin, naming { exename = supplier source_files { Notify_Supplier.cpp diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp index 6c7c5447c96..83a910e565a 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp @@ -1,6 +1,6 @@ #include "Notify_Consumer.h" -#include "orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "ace/OS_main.h" ACE_RCSID (Notify, diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h index 3b9cb99b1e5..484963ddf43 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h @@ -17,11 +17,11 @@ #ifndef NOTIFY_CONSUMER_H #define NOTIFY_CONSUMER_H -#include "orbsvcs/DsNotifyLogAdminS.h" -#include "orbsvcs/DsEventLogAdminC.h" -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/CosNotifyCommS.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/orbsvcs/DsEventLogAdminC.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommS.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index 5a8edb31e03..14dcf3155d8 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp @@ -1,5 +1,5 @@ #include "Notify_Supplier.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "ace/OS_main.h" ACE_RCSID (Notify, diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h index ecba0889eaa..7e68335f786 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h @@ -17,10 +17,10 @@ #ifndef NOTIFY_SUPPLIER_H #define NOTIFY_SUPPLIER_H -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/DsNotifyLogAdminC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/CosNotifyCommS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/DsNotifyLogAdminC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommS.h" class Filter_StructuredPushSupplier; diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp index 396b9e8c77e..ebf87ba501c 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp @@ -1,6 +1,6 @@ #include "RTEvent_Consumer.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "ace/OS_main.h" ACE_RCSID (RTEvent, diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h index 5c908495901..cbdeb7b1d80 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h @@ -17,9 +17,9 @@ #ifndef RTEVENT_CONSUMER_H #define RTEVENT_CONSUMER_H -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RTEventLogAdminC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RTEventLogAdminC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index a98457d4f72..8af49c7efc9 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -1,6 +1,6 @@ #include "RTEvent_Supplier.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "ace/OS_main.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h index 170a98db896..1d05033b459 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h @@ -17,9 +17,9 @@ #ifndef RTEVENT_SUPPLIER_H #define RTEVENT_SUPPLIER_H -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RTEventLogAdminC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RTEventLogAdminC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index e0960aed1a6..ec4101f7ca7 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -16,9 +16,9 @@ #ifndef NOTIFY_FILTER_CLIENT_H #define NOTIFY_FILTER_CLIENT_H -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/SString.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc index 0c0e54324fc..061cdf7d4ae 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc +++ b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, notification, notification_skel, naming { +project : orbsvcsexe, notification, naming { } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h index bc7a3316a5c..4194e62bd31 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h @@ -16,8 +16,8 @@ #include "ORB_Objects.h" #include "tao/RTCORBA/RTCORBA.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "ace/SString.h" /** diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index 2a1c42434b4..2b29678007d 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -4,8 +4,8 @@ #include "Consumer.h" #include "ORB_Run_Task.h" #include "ace/Arg_Shifter.h" -#include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h index e846e43303b..2cbab1c3352 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h @@ -16,8 +16,8 @@ #include "tao/RTCORBA/RTCORBA.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" /** * @class TAO_Notify_ORB_Objects diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h index 33182f595ee..d01675cb10b 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h @@ -15,8 +15,8 @@ #include "ORB_Objects.h" #include "tao/RTCORBA/RTCORBA.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "ace/SString.h" #include "ace/Condition_Thread_Mutex.h" diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index f3aa4a7322e..bd760366a36 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -7,8 +7,8 @@ #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "Supplier.h" -#include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_errno.h" ACE_RCSID (Notify, TAO_Notify_Lanes_Supplier_Client, "$Id$") diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc index 6684e2215b1..589a889ed25 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc @@ -1,5 +1,6 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, notification, notification_skel, naming, minimum_corba { +project : orbsvcsexe, notification, naming { + avoids += minimum_corba } diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h index b9b05c2d39e..ff46bc4e5a1 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -16,9 +16,9 @@ #ifndef NOTIFY_SUBSCRIBE_CLIENT_H #define NOTIFY_SUBSCRIBE_CLIENT_H -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h index ffe7ad82f73..614bc45268f 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h @@ -16,8 +16,8 @@ #include "ORB_Objects.h" #include "tao/RTCORBA/RTCORBA.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "ace/SString.h" #include "ace/OS_NS_time.h" diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index 11e04f8f4dc..4b4aa0283bf 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -4,8 +4,8 @@ #include "Consumer.h" #include "ORB_Run_Task.h" #include "ace/Arg_Shifter.h" -#include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc index ed469821a28..2be127fbfd1 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc @@ -1,5 +1,6 @@ // $Id$ -project(*Supplier): rtnotify, notifytest, rtportableserver, minimum_corba { +project(*Supplier): rtnotify, notifytest, rtportableserver { + avoids += minimum_corba exename = Supplier Source_Files { Supplier.cpp @@ -9,7 +10,8 @@ project(*Supplier): rtnotify, notifytest, rtportableserver, minimum_corba { } } -project(*Consumer): rtnotify, notifytest, rtportableserver, minimum_corba { +project(*Consumer): rtnotify, notifytest, rtportableserver { + avoids += minimum_corba exename = Consumer Source_Files { Consumer.cpp diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h index 7ca6ab99442..9ec6510cb60 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h @@ -15,8 +15,8 @@ #include "tao/RTCORBA/RTCORBA.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" /** * @class TAO_Notify_ORB_Objects diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h index 1a3c7893c76..e19d6b55401 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h @@ -15,8 +15,8 @@ #include "ORB_Objects.h" #include "tao/RTCORBA/RTCORBA.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "ace/Condition_Thread_Mutex.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index ed563e2e69d..bc23e0c05b3 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -7,8 +7,8 @@ #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "Supplier.h" -#include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_errno.h" ACE_RCSID (Notify, TAO_Notify_ThreadPool_Supplier_Client, "$Id$") diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf b/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf index 80a46e01105..f197dcef2ee 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf @@ -1,3 +1,3 @@ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous" -##dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () "" +##dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () "" dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" diff --git a/TAO/orbsvcs/examples/ORT/ORT.mpc b/TAO/orbsvcs/examples/ORT/ORT.mpc index 66df1682a11..c7442bcc119 100644 --- a/TAO/orbsvcs/examples/ORT/ORT.mpc +++ b/TAO/orbsvcs/examples/ORT/ORT.mpc @@ -1,5 +1,6 @@ // $Id$ -project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba { +project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client { + avoids += minimum_corba source_files { GatewayC.cpp GatewayS.cpp @@ -12,9 +13,10 @@ project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba { } } -project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba, iorinterceptor { +project(*Server) : orbsvcsexe, dynamicinterface, ifr_client { exename = server after += *Gateway + avoids += minimum_corba source_files { server.cpp GatewayC.cpp @@ -32,7 +34,8 @@ project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba, iori } } -project(*Client) : orbsvcsexe, event, minimum_corba { +project(*Client) : orbsvcsexe, event { + avoids += minimum_corba after += *Server source_files { client.cpp diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp index 854519127e0..afb2783d8af 100644 --- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp +++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp @@ -2,6 +2,7 @@ #include "Object_Factory_i.h" #include "tao/PortableServer/POA.h" +#include "tao/PortableServer/ObjectReferenceTemplate.h" Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr gateway_poa) @@ -28,9 +29,7 @@ Object_Factory_i::create_object (const char *interface_repository_id, const PortableInterceptor::ObjectId *obj_id = ACE_reinterpret_cast (const PortableInterceptor::ObjectId *, &id.in ()); - ACE_UNUSED_ARG(obj_id); - ACE_UNUSED_ARG(interface_repository_id); -/* + TAO_POA *poa = dynamic_cast <TAO_POA *> (this->gateway_poa_); ACE_CHECK_RETURN (CORBA::Object::_nil ()); @@ -44,7 +43,7 @@ Object_Factory_i::create_object (const char *interface_repository_id, ort->make_object (interface_repository_id, *obj_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ());*/ + ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return CORBA::Object::_nil(); + return object_ptr; } diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp index 17ae07e376a..1f6d7a9e796 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp @@ -1,10 +1,10 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Arg_Shifter.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h index c8268e1c3ea..e096cc9d86b 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h @@ -12,7 +12,7 @@ #ifndef CONSUMER_H #define CONSUMER_H -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp index 29e85721e86..ad503080423 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp @@ -1,12 +1,12 @@ // $Id$ #include "EC.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Event/EC_Gateway.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway.h" #include "ace/Arg_Shifter.h" ACE_RCSID (EC_Examples, diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h index 2734de1dcd0..ee85894676e 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h @@ -12,7 +12,7 @@ #ifndef EC_H #define EC_H -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp index 11a219fd352..17944dad818 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp @@ -1,11 +1,11 @@ // $Id$ #include "Gateway.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Event/EC_Gateway_IIOP.h" -#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h" #include "ace/Arg_Shifter.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h index 6c7d931d988..d54c2519354 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h @@ -11,7 +11,7 @@ #ifndef GATEWAY_H #define GATEWAY_H -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp index 6d8586d16a8..ce16ed2237e 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp @@ -1,10 +1,10 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Arg_Shifter.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h index 98e87ec39d2..65e67be9ed9 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h @@ -11,7 +11,7 @@ #ifndef SUPPLIER_H #define SUPPLIER_H -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h index 8439914f22b..41e999a9416 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h @@ -18,7 +18,7 @@ #define ADDRSERVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" class AddrServer : public POA_RtecUDPAdmin::AddrServer { diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp index dba1cb22b01..8d41d2b200d 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp @@ -1,8 +1,8 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" ACE_RCSID (EC_Examples, Consumer, diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h index 536404b824b..5a8a514e190 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h @@ -17,8 +17,8 @@ #ifndef CONSUMER_H #define CONSUMER_H -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp index 4ab33c1ee29..052a5fe8280 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp @@ -4,13 +4,13 @@ #include "Consumer.h" #include "Supplier.h" #include "AddrServer.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/ECG_Mcast_EH.h" -#include "orbsvcs/Event/ECG_UDP_Sender.h" -#include "orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp index f83b00c5864..84a8d5a9f10 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp @@ -1,8 +1,8 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" ACE_RCSID (EC_Examples, Supplier, diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h index 7c591f5fdb7..a44b55a18aa 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h @@ -17,8 +17,8 @@ #ifndef SUPPLIER_H #define SUPPLIER_H -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h index bdbdbaad894..e89e7df6977 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h @@ -17,7 +17,7 @@ #ifndef CONSUMER_H #define CONSUMER_H -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h b/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h index 3a6d4463fa3..71197184d8e 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h @@ -3,7 +3,7 @@ // This file was automatically generated by the Scheduler_Factory. // Before editing the file please consider generating it again. -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" // There were no scheduling anomalies. diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index 1011f5d53bc..fcf9123becd 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "orbsvcs/Sched/Reconfig_Scheduler.h" -#include "orbsvcs/Runtime_Scheduler.h" -#include "orbsvcs/Event/Module_Factory.h" -#include "orbsvcs/Event/Event_Channel.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h" +#include "orbsvcs/orbsvcs/Runtime_Scheduler.h" +#include "orbsvcs/orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" #include "Consumer.h" #include "Supplier.h" diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h index b0391f7602b..c2a428371a6 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h @@ -17,7 +17,7 @@ #ifndef SUPPLIER_H #define SUPPLIER_H -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp index d49a22fa62a..18d42999eab 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp @@ -1,9 +1,9 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" ACE_RCSID (EC_Examples, Consumer, diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h index 19005b96ec1..ebbcb6fa5f9 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h @@ -17,7 +17,7 @@ #ifndef CONSUMER_H #define CONSUMER_H -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp index 4bc618c1232..9b4692a69ed 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" #include "ace/Get_Opt.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" ACE_RCSID (EC_Examples, diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp index 850888b1d77..a91a5f8ec05 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp @@ -1,9 +1,9 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (EC_Examples, diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h index b1fce544ccc..e358500267d 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h @@ -17,7 +17,7 @@ #ifndef SUPPLIER_H #define SUPPLIER_H -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/Security/Send_File/README b/TAO/orbsvcs/examples/Security/Send_File/README index c02ca187f21..e0b149b01f4 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/README +++ b/TAO/orbsvcs/examples/Security/Send_File/README @@ -37,16 +37,14 @@ phrase (it is 'test'). ======= Testing IIOP interoperability - We also want to verify that the client and server (assuming - "-SSLNoProtection" flag is set in server's `server.conf' file) - can interoperate with regular IIOP servers and clients. + We also want to verify that the client and +server can interoperate with regular IIOP servers and clients. First setup a pure IIOP server: $ server -o test.ior $ client -ORBSvcConf client.conf -k file://test.ior < myfile - next a pure IIOP client (assuming "-SSLNoProtection" flag is - set in server's `server.conf' file): + next a pure IIOP client: $ server -ORBSvcConf server.conf -o test.ior $ client -k file://test.ior < myfile diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.conf b/TAO/orbsvcs/examples/Security/Send_File/server.conf index e178933feb9..ee0ef1aa57c 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.conf +++ b/TAO/orbsvcs/examples/Security/Send_File/server.conf @@ -1,4 +1,4 @@ # $Id$ -dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem -SSLNoProtection" +dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem" static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory" diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc index db2b00eb703..48ed722aa12 100644 --- a/TAO/orbsvcs/orbsvcs/AV.mpc +++ b/TAO/orbsvcs/orbsvcs/AV.mpc @@ -3,7 +3,7 @@ project(AV) : orbsvcslib, core, property, naming, qos { sharedname = TAO_AV - idlflags += -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h + idlflags += -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h dynamicflags = TAO_AV_BUILD_DLL tagchecks += AV pch_header = diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index f53b3ddba1d..b5b79a52ae4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -29,20 +29,20 @@ #include "ace/SOCK_Acceptor.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/AV/AV_export.h" -#include "orbsvcs/CosPropertyServiceS.h" -#include "orbsvcs/AVStreamsS.h" -#include "orbsvcs/Property/CosPropertyService_i.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/AV/AV_Core.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/Null_MediaCtrlS.h" +#include "orbsvcs/orbsvcs/AV/AV_export.h" +#include "orbsvcs/orbsvcs/CosPropertyServiceS.h" +#include "orbsvcs/orbsvcs/AVStreamsS.h" +#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/AV/AV_Core.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/Null_MediaCtrlS.h" #if defined (TAO_ORBSVCS_HAS_Trader) -#include "orbsvcs/Trader/Trader.h" +#include "orbsvcs/orbsvcs/Trader/Trader.h" #endif /* TAO_ORBSVCS_HAS_Trader */ -#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h" #define FLOWSPEC_MAX 5 // for the Hash_Map helper classes. diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 08597e73734..f97ad1cb0aa 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -1,22 +1,22 @@ // $Id$ -#include "orbsvcs/AV/AV_Core.h" -#include "orbsvcs/AV/FlowSpec_Entry.h" -#include "orbsvcs/AV/Transport.h" -#include "orbsvcs/AV/Protocol_Factory.h" -#include "orbsvcs/AV/UDP.h" -#include "orbsvcs/AV/TCP.h" -#include "orbsvcs/AV/RTP.h" -#include "orbsvcs/AV/RTCP.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/default_resource.h" +#include "orbsvcs/orbsvcs/AV/AV_Core.h" +#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/orbsvcs/AV/Transport.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/UDP.h" +#include "orbsvcs/orbsvcs/AV/TCP.h" +#include "orbsvcs/orbsvcs/AV/RTP.h" +#include "orbsvcs/orbsvcs/AV/RTCP.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/default_resource.h" #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) -#include "orbsvcs/AV/QoS_UDP.h" +#include "orbsvcs/orbsvcs/AV/QoS_UDP.h" #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ #if defined (ACE_HAS_SCTP) -#include "orbsvcs/AV/SCTP_SEQ.h" +#include "orbsvcs/orbsvcs/AV/SCTP_SEQ.h" #endif // ACE_HAS_SCTP #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h index d6ac2037153..1cc2e78de16 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -15,8 +15,8 @@ #include /**/ "ace/pre.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/AVStreamsC.h" -#include "orbsvcs/AV/AV_export.h" +#include "orbsvcs/orbsvcs/AVStreamsC.h" +#include "orbsvcs/orbsvcs/AV/AV_export.h" #include "ace/Singleton.h" #include "ace/Unbounded_Set.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h index e171286341a..8abf7e851f4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h @@ -16,7 +16,7 @@ #define TAO_AV_FLOWSPEC_ENTRY_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/AV_export.h" +#include "orbsvcs/orbsvcs/AV/AV_export.h" #include "AV_Core.h" #include "ace/Addr.h" #include "ace/Containers.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Makefile.am b/TAO/orbsvcs/orbsvcs/AV/Makefile.am new file mode 100644 index 00000000000..8aa87e9e67d --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/AV/Makefile.am @@ -0,0 +1,42 @@ +##--------------------------------------------------------------------------- +## $Id$ +## +## Makefile for TAO's Audio/Visual (AV) Service library +## +##--------------------------------------------------------------------------- + +## +## Process this file with automake to create Makefile.in +## + +## The number in AUTOMAKE_OPTIONS is the minimum required version automake +## needed to process this file. +AUTOMAKE_OPTIONS = 1.4 + +INCLUDES = -I$(top_builddir) -I$(top_srcdir) + +lib_LTLIBRARIES = libTAO_AV.la + +libTAO_AV_la_LDADD = \ + $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la + +libTAO_AV_la_SOURCES = \ + AVStreams_i.cpp \ + Endpoint_Strategy.cpp \ + Endpoint_Strategy_T.cpp \ + sfp.cpp + +noinst_HEADERS = \ + AVStreams_i.h \ + Endpoint_Strategy.h \ + Endpoint_Strategy_T.h \ + sfp.h + +EXTRA_DIST = README + +## Clean up some additional files/directories possibly created during +## the configure script tests. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations + diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h index 24fd3082914..b26ef80acfb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h @@ -18,7 +18,7 @@ #include "ace/Addr.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/AV/AV_export.h" +#include "orbsvcs/orbsvcs/AV/AV_export.h" struct TAO_AV_frame_info { diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index b4420b21ee5..cdc48d2316a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -6,12 +6,12 @@ #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) #include "UDP.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/MCast.h" -#include "orbsvcs/AV/Fill_ACE_QoS.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/AV/QoS_UDP.i" +#include "orbsvcs/orbsvcs/AV/QoS_UDP.i" #endif /* __ACE_INLINE__ */ //------------------------------------------------------------ diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h index ebc49bc6147..702fc27aa90 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h @@ -29,7 +29,7 @@ #include "ace/QoS/QoS_Decorator.h" #include "ace/QoS/SOCK_Dgram_Mcast_QoS.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h index 38555b63efd..4465ae7cf25 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h @@ -51,11 +51,11 @@ // FUZZ: disable check_for_math_include #include "ace/OS.h" #include "ace/Hash_Map_Manager.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/UDP.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/UDP.h" #include <math.h> #include <stdlib.h> -#include "orbsvcs/AV/RTP.h" +#include "orbsvcs/orbsvcs/AV/RTP.h" #include "RTCP_Channel.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h index 1af28588edd..a6ef7fef8ed 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h @@ -50,8 +50,8 @@ #define TAO_AV_RTP_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/AV_export.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/AV_export.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" #define RTP_PT_BVC 22 /* Berkeley video codec */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h index aa50d43203d..d38e975de83 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h @@ -12,7 +12,7 @@ #define TAO_AV_DEFAULT_RESOURCE_FCATORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h index 8de06427317..8ca19263633 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.h +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h @@ -22,7 +22,7 @@ #include "ace/Connector.h" #include "ace/Addr.h" #include "ace/SOCK_Dgram.h" -#include "orbsvcs/AV/AV_export.h" +#include "orbsvcs/orbsvcs/AV/AV_export.h" #include "FlowSpec_Entry.h" #include "AV_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp index e29c8e154ce..4c8b45256dc 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/AV/default_resource.h" +#include "orbsvcs/orbsvcs/AV/default_resource.h" #include "tao/ORB_Core.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.h b/TAO/orbsvcs/orbsvcs/AV/default_resource.h index 01420bb907f..2867e024e28 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.h +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.h @@ -13,8 +13,8 @@ #define TAO_AV_DEFAULT_RESOURCE_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Resource_Factory.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Resource_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index 1885a633231..70bba33f830 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -14,8 +14,8 @@ #define TAO_AV_SFP_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/AV_export.h" -#include "orbsvcs/sfpC.h" +#include "orbsvcs/orbsvcs/AV/AV_export.h" +#include "orbsvcs/orbsvcs/sfpC.h" #include "ace/SOCK_Dgram.h" #include "ace/INET_Addr.h" diff --git a/TAO/orbsvcs/orbsvcs/CSI.idl b/TAO/orbsvcs/orbsvcs/CSI.idl index bf19d332c1e..bc6c4fc6680 100644 --- a/TAO/orbsvcs/orbsvcs/CSI.idl +++ b/TAO/orbsvcs/orbsvcs/CSI.idl @@ -15,7 +15,7 @@ #define _CSI_IDL_ // #include <IOP.idl> -#include "tao/IOP_IOR.pidl" +#include <tao/IOP_IOR.pidl> module IOP { diff --git a/TAO/orbsvcs/orbsvcs/CSIIOP.idl b/TAO/orbsvcs/orbsvcs/CSIIOP.idl index 1807ab38d40..973b4a5a7d1 100644 --- a/TAO/orbsvcs/orbsvcs/CSIIOP.idl +++ b/TAO/orbsvcs/orbsvcs/CSIIOP.idl @@ -14,8 +14,8 @@ #define _CSIIOP_IDL_ //#include <IOP.pidl> -#include "tao/IOP_IOR.pidl" -#include "CSI.idl" +#include <tao/IOP_IOR.pidl> +#include <CSI.idl> //import ::IOP //import ::CSI diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients.h b/TAO/orbsvcs/orbsvcs/Channel_Clients.h index 51ee8c8e9ac..16b0c45c420 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients.h @@ -18,7 +18,7 @@ #define ACE_CHANNEL_CLIENTS_H #include /**/ "ace/pre.h" -#include "orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" #include /**/ "ace/post.h" #endif /* ACE_CHANNEL_CLIENTS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp index a8a79821a67..695611bf0c5 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp @@ -3,14 +3,14 @@ #ifndef ACE_CHANNEL_CLIENTS_T_C #define ACE_CHANNEL_CLIENTS_T_C -#include "orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" ACE_RCSID (orbsvcs, Channel_Clients_T, "$Id$") #if !defined (__ACE_INLINE__) -#include "orbsvcs/Channel_Clients_T.i" +#include "orbsvcs/orbsvcs/Channel_Clients_T.i" #endif /* __ACE_INLINE__ */ template<class TARGET> void diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h index f81af14d074..472a73753f9 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h @@ -25,7 +25,7 @@ #define ACE_CHANNEL_CLIENTS_T_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" // @@ TODO: Add throw specs to this classes. @@ -83,11 +83,11 @@ private: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/Channel_Clients_T.i" +#include "orbsvcs/orbsvcs/Channel_Clients_T.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Channel_Clients_T.cpp" +#include "orbsvcs/orbsvcs/Channel_Clients_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h index 668ee73708b..f84ffd871dd 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" #include "concurrency_export.h" /// This constant defines the number of lock modes. There is really no diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h index 75bb4e1a88f..12da31cc6df 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -44,7 +44,7 @@ #include "ace/Token.h" #include "ace/Unbounded_Queue.h" -#include "orbsvcs/CosConcurrencyControlS.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlS.h" #include "concurrency_export.h" #if defined (lock_held) diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h index b49944528d8..8e052406c9f 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosConcurrencyControlS.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlS.h" #include "concurrency_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h index 30f680393cb..bdeee1f5775 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Concurrency/Concurrency_Utils.h" +#include "orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h" class TAO_Concurrency_Export TAO_Concurrency_Loader : public TAO_Object_Loader { diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp index 5aaa4d8d70b..88f46386065 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -11,7 +11,7 @@ #include "ace/streams.h" -#include "orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" #include "tao/debug.h" #include "Concurrency_Utils.h" diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h index ac92e019ecb..b343cd6f61c 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h @@ -22,7 +22,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" #include "CC_LockSetFactory.h" #include "concurrency_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am b/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am new file mode 100644 index 00000000000..1038e3ee925 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am @@ -0,0 +1,41 @@ +##--------------------------------------------------------------------------- +## $Id$ +## +## Makefile for TAO's Concurrency Service library +## +##--------------------------------------------------------------------------- + +## +## Process this file with automake to create Makefile.in +## + +## The number in AUTOMAKE_OPTIONS is the minimum required version automake +## needed to process this file. +AUTOMAKE_OPTIONS = 1.4 + +INCLUDES = -I$(top_builddir) -I$(top_srcdir) + +lib_LTLIBRARIES = libTAO_Concurrency.la + +libTAO_Concurrency_la_LDADD = \ + $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la + +libTAO_Concurrency_la_SOURCES = \ + CC_Lock.cpp \ + CC_LockSet.cpp \ + CC_LockSetFactory.cpp \ + Concurrency_Utils.cpp + +noinst_HEADERS = \ + CC_Lock.h \ + CC_LockSet.h \ + CC_LockSetFactory.h \ + Concurrency_Utils.h + + +## Clean up some additional files/directories possibly created during +## the configure script tests. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations + diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc index 23377e65db8..c8bd81a0c35 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc @@ -3,7 +3,7 @@ project(CosConcurrency) : orbsvcslib, core, portableserver { sharedname = TAO_CosConcurrency - idlflags += -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h + idlflags += -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=Concurrency/concurrency_export.h dynamicflags = TAO_CONCURRENCY_BUILD_DLL tagchecks += Concurrency pch_header = @@ -20,7 +20,4 @@ project(CosConcurrency) : orbsvcslib, core, portableserver { Concurrency } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index 8446fb375cd..9181b72a2da 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -1,78 +1,32 @@ // $Id$ -project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events { +project (CosEvent) : ec_typed_events, orbsvcslib, messaging, core, naming { sharedname = TAO_CosEvent - dynamicflags = TAO_EVENT_BUILD_DLL + avoids += minimum_corba - idlflags += -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h + // Warning : The idlflags must match exactly those used in + // CosNotification, because we don't know which project + // will actually generate the IDL. For this reason we + // also just use the event_export.h and macros for both + // services. + idlflags += -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h - IDL_Files { - CosEventComm.idl - CosEventChannelAdmin.idl - } - - Source_Files { - CosEventCommC.cpp - CosEventChannelAdminC.cpp - } - - Header_Files { - CosEventCommC.h - CosEventChannelAdminC.h - } - - Inline_Files { - CosEventCommC.inl - CosEventChannelAdminC.inl - } - - Template_Files { - } - - // explicit Resource_Files to avoid including _Skel & _Serv rc files. - Resource_Files { - CosEvent.rc - } -} - - -project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver, ec_typed_events_skel { - sharedname = TAO_CosEvent_Skel - dynamicflags = TAO_EVENT_SKEL_BUILD_DLL + // Set both DLL flags because of the shared idl files + dynamicflags = TAO_EVENT_BUILD_DLL TAO_NOTIFY_BUILD_DLL - IDL_Files { - } - - Source_Files { - CosEventCommS.cpp - CosEventChannelAdminS.cpp - } - - Header_Files { - CosEventCommS.h - CosEventChannelAdminS.h - } - - Inline_Files { - CosEventCommS.inl - CosEventChannelAdminS.inl - } - - Template_Files { - } -} - - -project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_events_serv, messaging, naming, svc_utils { - sharedname = TAO_CosEvent_Serv - dynamicflags = TAO_EVENT_SERV_BUILD_DLL tagchecks += CosEvent IDL_Files { + CosEventComm.idl + CosEventChannelAdmin.idl } Source_Files(ORBSVCS_COMPONENTS) { CosEvent { + CosEventCommC.cpp + CosEventChannelAdminC.cpp + CosEventCommS.cpp + CosEventChannelAdminS.cpp CosEvent/CEC_ConsumerAdmin.cpp CosEvent/CEC_ConsumerControl.cpp CosEvent/CEC_Default_Factory.cpp @@ -94,7 +48,4 @@ project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_ CosEvent/CEC_SupplierControl.cpp } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index faa5d2b9ac0..c1044726527 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -6,7 +6,7 @@ #include "CEC_ProxyPushConsumer.h" #include "CEC_EventChannel.h" -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "CEC_ConsumerAdmin.i" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index 980431bedbb..a56cbbed72f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -15,17 +15,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Proxy_Admin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h" #include "CEC_ProxyPushSupplier.h" #include "CEC_ProxyPullSupplier.h" -#include "event_serv_export.h" +#include "event_export.h" class TAO_CEC_EventChannel; @@ -45,7 +45,7 @@ class TAO_CEC_EventChannel; * externally. * = TODO */ -class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin +class TAO_Event_Export TAO_CEC_ConsumerAdmin : public POA_CosEventChannelAdmin::ConsumerAdmin { public: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp index 180466d987e..80f1bcfbdb6 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp @@ -49,17 +49,6 @@ TAO_CEC_ConsumerControl::system_exception (TAO_CEC_ProxyPushSupplier *, { } -bool -TAO_CEC_ConsumerControl::need_to_disconnect (PortableServer::ServantBase*) -{ - return true; -} - -void -TAO_CEC_ConsumerControl::successful_transmission (PortableServer::ServantBase*) -{ -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index f3a405d26c7..07293872b3f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -21,8 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/CosEvent/event_serv_export.h" + +#include "orbsvcs/orbsvcs/CosEvent/event_export.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushSupplier; @@ -44,7 +44,7 @@ namespace CORBA * = LOCKING * = TODO */ -class TAO_Event_Serv_Export TAO_CEC_ConsumerControl +class TAO_Event_Export TAO_CEC_ConsumerControl { public: /// Constructor. It does not assume ownership of the <event_channel> @@ -80,15 +80,6 @@ public: virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy, CORBA::SystemException & ACE_ENV_ARG_DECL_NOT_USED); - - /// Do we need to disconnect this supplier? The parameter type for - /// proxy is PortableServer::ServantBase* due to the fact that this - /// method will be used for TAO_CEC_ProxyPushSupplier's and - /// TAO_CEC_ProxyPullSupplier's. - virtual bool need_to_disconnect (PortableServer::ServantBase* proxy); - - /// Allow others to inform us when a send or receive was successful. - virtual void successful_transmission (PortableServer::ServantBase* proxy); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index 6be89cac48a..58f079b3cd9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -13,12 +13,12 @@ #include "CEC_Reactive_ConsumerControl.h" #include "CEC_Reactive_SupplierControl.h" -#include "orbsvcs/ESF/ESF_Immediate_Changes.h" -#include "orbsvcs/ESF/ESF_Delayed_Changes.h" -#include "orbsvcs/ESF/ESF_Copy_On_Write.h" -#include "orbsvcs/ESF/ESF_Copy_On_Read.h" -#include "orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h" #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" @@ -334,8 +334,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECConsumerControlTimeout")) == 0 || - ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECConsumerControlRoundtripTimeout")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECConsumerControlTimeout")) == 0) { arg_shifter.consume_arg (); @@ -348,8 +347,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECSupplierControlTimeout")) == 0 || - ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECSupplierControlRoundtripTimeout")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECSupplierControlTimeout")) == 0) { arg_shifter.consume_arg (); @@ -362,18 +360,6 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECProxyDisconnectRetries")) == 0) - { - arg_shifter.consume_arg (); - - if (arg_shifter.is_parameter_next ()) - { - const ACE_TCHAR* opt = arg_shifter.get_current (); - this->proxy_disconnect_retries_ = ACE_OS::atoi (opt); - arg_shifter.consume_arg (); - } - } - else if (ACE_OS::strncmp (arg, ACE_LIB_TEXT("-CEC"), 3) == 0) { arg_shifter.consume_arg (); @@ -447,9 +433,8 @@ TAO_CEC_Default_Factory::create_pulling_strategy (TAO_CEC_EventChannel *ec) CORBA::ORB_init (argc, argv, this->orbid_); ACE_Time_Value rate (0, this->reactive_pulling_period_); - return new TAO_CEC_Reactive_Pulling_Strategy ( - rate, this->supplier_control_timeout_, - ec, orb.in ()); + return new TAO_CEC_Reactive_Pulling_Strategy (rate, ec, + orb.in ()); } return 0; } @@ -1229,10 +1214,7 @@ TAO_CEC_Default_Factory::create_consumer_control (TAO_CEC_EventChannel* ec) CORBA::ORB_init (argc, argv, this->orbid_); ACE_Time_Value rate (0, this->consumer_control_period_); - return new TAO_CEC_Reactive_ConsumerControl ( - rate, this->consumer_control_timeout_, - this->proxy_disconnect_retries_, - ec, orb.in ()); + return new TAO_CEC_Reactive_ConsumerControl (rate, consumer_control_timeout_, ec, orb.in ()); } return 0; } @@ -1251,10 +1233,7 @@ TAO_CEC_Default_Factory::create_consumer_control (TAO_CEC_TypedEventChannel* ec) CORBA::ORB_init (argc, argv, this->orbid_); ACE_Time_Value rate (0, this->consumer_control_period_); - return new TAO_CEC_Reactive_ConsumerControl ( - rate, this->consumer_control_timeout_, - this->proxy_disconnect_retries_, - ec, orb.in ()); + return new TAO_CEC_Reactive_ConsumerControl (rate, consumer_control_timeout_, ec, orb.in ()); } return 0; } @@ -1278,11 +1257,8 @@ TAO_CEC_Default_Factory::create_supplier_control (TAO_CEC_EventChannel* ec) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, this->orbid_); - ACE_Time_Value rate (0, this->supplier_control_period_); - return new TAO_CEC_Reactive_SupplierControl ( - rate, this->supplier_control_timeout_, - this->proxy_disconnect_retries_, - ec, orb.in ()); + ACE_Time_Value rate (0, this->consumer_control_period_); + return new TAO_CEC_Reactive_SupplierControl (rate, supplier_control_timeout_, ec, orb.in ()); } return 0; } @@ -1300,11 +1276,8 @@ TAO_CEC_Default_Factory::create_supplier_control (TAO_CEC_TypedEventChannel* ec) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, this->orbid_); - ACE_Time_Value rate (0, this->supplier_control_period_); - return new TAO_CEC_Reactive_SupplierControl ( - rate, this->supplier_control_timeout_, - this->proxy_disconnect_retries_, - ec, orb.in ()); + ACE_Time_Value rate (0, this->consumer_control_period_); + return new TAO_CEC_Reactive_SupplierControl (rate, supplier_control_timeout_, ec, orb.in ()); } return 0; } @@ -1324,7 +1297,7 @@ ACE_STATIC_SVC_DEFINE (TAO_CEC_Default_Factory, &ACE_SVC_NAME (TAO_CEC_Default_Factory), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) -ACE_FACTORY_DEFINE (TAO_Event_Serv, TAO_CEC_Default_Factory) +ACE_FACTORY_DEFINE (TAO_Event, TAO_CEC_Default_Factory) // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h index d314e1785ca..07536f4627c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h @@ -38,7 +38,7 @@ * set in the service configurator file. * = MEMORY MANAGMENT */ -class TAO_Event_Serv_Export TAO_CEC_Default_Factory : public TAO_CEC_Factory +class TAO_Event_Export TAO_CEC_Default_Factory : public TAO_CEC_Factory { public: /// Constructor @@ -199,9 +199,6 @@ private: /// The consumer and supplier control timeout in usecs ACE_Time_Value consumer_control_timeout_; ACE_Time_Value supplier_control_timeout_; - - /// The number of retries before disconnecting a proxy - unsigned int proxy_disconnect_retries_; }; #if defined (__ACE_INLINE__) @@ -209,7 +206,7 @@ private: #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_CEC_Default_Factory) -ACE_FACTORY_DECLARE (TAO_Event_Serv, TAO_CEC_Default_Factory) +ACE_FACTORY_DECLARE (TAO_Event, TAO_CEC_Default_Factory) #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i index b039316d2cb..f7699383cb4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i @@ -20,7 +20,6 @@ TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void) consumer_control_period_ (TAO_CEC_DEFAULT_CONSUMER_CONTROL_PERIOD), supplier_control_period_ (TAO_CEC_DEFAULT_SUPPLIER_CONTROL_PERIOD), consumer_control_timeout_ (0, TAO_CEC_DEFAULT_CONSUMER_CONTROL_TIMEOUT), - supplier_control_timeout_ (0, TAO_CEC_DEFAULT_SUPPLIER_CONTROL_TIMEOUT), - proxy_disconnect_retries_ (TAO_CEC_DEFAULT_PROXY_DISCONNECT_RETRIES) + supplier_control_timeout_ (0, TAO_CEC_DEFAULT_SUPPLIER_CONTROL_TIMEOUT) { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h index 5a97e4bd902..8cf65a09905 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h @@ -118,10 +118,6 @@ # define TAO_CEC_DEFAULT_SUPPLIER_CONTROL_TIMEOUT 10000 /* usecs */ #endif /* TAO_CEC_DEFAULT_SUPPLIER_CONTROL_TIMEOUT */ -#ifndef TAO_CEC_DEFAULT_PROXY_DISCONNECT_RETRIES -# define TAO_CEC_DEFAULT_PROXY_DISCONNECT_RETRIES 0 -#endif /* TAO_CEC_DEFAULT_PROXY_DISCONNECT_RETRIES */ - #include /**/ "ace/post.h" #endif /* TAO_CEC_DEFAULTS_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index a6ba0f8a724..b121b22e54d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -16,9 +16,9 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEventCommC.h" +#include "orbsvcs/orbsvcs/CosEventCommC.h" -#include "event_serv_export.h" +#include "event_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -40,7 +40,7 @@ class TAO_CEC_TypedEvent; * for each queue or can simply push the event to the consumer in * FIFO order. */ -class TAO_Event_Serv_Export TAO_CEC_Dispatching +class TAO_Event_Export TAO_CEC_Dispatching { public: /// destructor... @@ -84,7 +84,7 @@ public: * The events are dispatched in FIFO ordering, using the invoking * thread to push the event to the consumer. */ -class TAO_Event_Serv_Export TAO_CEC_Reactive_Dispatching : public TAO_CEC_Dispatching +class TAO_Event_Export TAO_CEC_Reactive_Dispatching : public TAO_CEC_Dispatching { public: /// The scheduler is used to find the range of priorities and similar diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index fe5b698b592..ac24df18469 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -28,7 +28,7 @@ #include "tao/Basic_Types.h" #include "tao/Objref_VarOut_T.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "orbsvcs/orbsvcs/CosEvent/event_export.h" #include "CEC_ProxyPushSupplier.h" @@ -43,7 +43,7 @@ * dispatching. * */ -class TAO_Event_Serv_Export TAO_CEC_Dispatching_Task : public ACE_Task<ACE_SYNCH> +class TAO_Event_Export TAO_CEC_Dispatching_Task : public ACE_Task<ACE_SYNCH> { public: /// Constructor @@ -72,7 +72,7 @@ private: // **************************************************************** -class TAO_Event_Serv_Export TAO_CEC_Dispatch_Command : public ACE_Message_Block +class TAO_Event_Export TAO_CEC_Dispatch_Command : public ACE_Message_Block { public: /// Constructor, it will allocate its own data block @@ -91,7 +91,7 @@ public: // **************************************************************** -class TAO_Event_Serv_Export TAO_CEC_Shutdown_Task_Command : public TAO_CEC_Dispatch_Command +class TAO_Event_Export TAO_CEC_Shutdown_Task_Command : public TAO_CEC_Dispatch_Command { public: /// Constructor @@ -103,7 +103,7 @@ public: // **************************************************************** -class TAO_Event_Serv_Export TAO_CEC_Push_Command : public TAO_CEC_Dispatch_Command +class TAO_Event_Export TAO_CEC_Push_Command : public TAO_CEC_Dispatch_Command { public: /// Constructor @@ -129,7 +129,7 @@ private: // **************************************************************** #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -class TAO_Event_Serv_Export TAO_CEC_Invoke_Command : public TAO_CEC_Dispatch_Command +class TAO_Event_Export TAO_CEC_Invoke_Command : public TAO_CEC_Dispatch_Command { public: /// Constructor diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index df029202c74..ee171b6bbc8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -227,14 +227,3 @@ TAO_CEC_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) { this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Manager_Ex<PortableServer::ServantBase*, unsigned int, ServantBaseHash, ACE_Equal_To<PortableServer::ServantBase*>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Entry<PortableServer::ServantBase*, unsigned int>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableServer::ServantBase*, unsigned int, ServantBaseHash, ACE_Equal_To<PortableServer::ServantBase*>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Entry<PortableServer::ServantBase*, unsigned int> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index 55f9282abe2..90c4e9cd216 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -26,11 +26,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "CEC_Defaults.h" -#include "event_serv_export.h" -#include "ace/Hash_Map_Manager.h" +#include "event_export.h" /** * @class TAO_CEC_EventChannel_Attributes @@ -48,7 +47,7 @@ * an easy mechanism to extend the attributes without requiring * changes in the EC constructor. */ -class TAO_Event_Serv_Export TAO_CEC_EventChannel_Attributes +class TAO_Event_Export TAO_CEC_EventChannel_Attributes { public: /** @@ -98,23 +97,9 @@ private: * ConsumerAdmin and Dispatching) and to provide a simpler * interface to the CEC_Factory. */ -class TAO_Event_Serv_Export TAO_CEC_EventChannel : public POA_CosEventChannelAdmin::EventChannel +class TAO_Event_Export TAO_CEC_EventChannel : public POA_CosEventChannelAdmin::EventChannel { public: - class ServantBaseHash - { - public: - u_long operator() (PortableServer::ServantBase* const & ptr) const { - return ACE_reinterpret_cast(u_long, ptr); - } - }; - - typedef ACE_Hash_Map_Manager_Ex<PortableServer::ServantBase*, - unsigned int, - ServantBaseHash, - ACE_Equal_To<PortableServer::ServantBase*>, - TAO_SYNCH_MUTEX> ServantRetryMap; - /** * constructor * If <own_factory> is not 0 it assumes ownership of the factory. @@ -253,8 +238,6 @@ public: virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - ServantRetryMap& get_servant_retry_map (void); - private: /// The POAs used to activate "supplier-side" and "consumer-side" /// objects. @@ -294,8 +277,6 @@ private: /// suppliers TAO_CEC_ConsumerControl *consumer_control_; TAO_CEC_SupplierControl *supplier_control_; - - ServantRetryMap retry_map_; }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i index 256d518b72a..563dc6e69e0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i @@ -192,8 +192,3 @@ TAO_CEC_EventChannel::disconnect_callbacks (void) const return this->disconnect_callbacks_; } -ACE_INLINE TAO_CEC_EventChannel::ServantRetryMap& -TAO_CEC_EventChannel::get_servant_retry_map (void) -{ - return this->retry_map_; -} diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index 78f11357d3e..a7f8408d45f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -18,9 +18,9 @@ #include "CEC_Event_Loader.h" #include "ace/Dynamic_Service.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" @@ -459,7 +459,7 @@ TAO_CEC_Event_Loader::fini (void) return 0; } -ACE_FACTORY_DEFINE (TAO_Event_Serv, TAO_CEC_Event_Loader) +ACE_FACTORY_DEFINE (TAO_Event, TAO_CEC_Event_Loader) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Dynamic_Service<TAO_CEC_Event_Loader>; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index d48c98c3705..4d4ca86a992 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -23,7 +23,7 @@ #include "CEC_TypedEventChannel.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Service_Config.h" @@ -32,7 +32,7 @@ * * @brief Dynamically load an instance of the COS Event Service. */ -class TAO_Event_Serv_Export TAO_CEC_Event_Loader : public TAO_Object_Loader +class TAO_Event_Export TAO_CEC_Event_Loader : public TAO_Object_Loader { public: /// Constructor @@ -98,6 +98,6 @@ private: ACE_UNIMPLEMENTED_FUNC (TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &)) }; -ACE_FACTORY_DECLARE (TAO_Event_Serv, TAO_CEC_Event_Loader) +ACE_FACTORY_DECLARE (TAO_Event, TAO_CEC_Event_Loader) #endif /* TAO_CEC_EVENT_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h index 7161eb63dfd..248ef824c76 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h @@ -22,7 +22,7 @@ #include "tao/Objref_VarOut_T.h" -#include "event_serv_export.h" +#include "event_export.h" class ACE_Lock; @@ -70,7 +70,7 @@ typedef TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPullSupplier> TAO_CEC_ProxyPullSup * Some implementations may require a different instance for the * CEC_Factory for each instance of a CEC_EventChannel. */ -class TAO_Event_Serv_Export TAO_CEC_Factory : public ACE_Service_Object +class TAO_Event_Export TAO_CEC_Factory : public ACE_Service_Object { public: /// destructor... diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h index d3a706ff5b8..ba779b69f40 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h @@ -34,7 +34,7 @@ class TAO_CEC_EventChannel; * threads. It's main purpose is to decouple the suppliers from * the client execution time, specially in the collocated case. */ -class TAO_Event_Serv_Export TAO_CEC_MT_Dispatching : public TAO_CEC_Dispatching +class TAO_Event_Export TAO_CEC_MT_Dispatching : public TAO_CEC_Dispatching { public: /// Constructor diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index fd172f89e1d..592b10354b4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -28,13 +28,10 @@ TAO_CEC_ProxyPullConsumer:: this->default_POA_ = this->event_channel_->consumer_poa (); - - this->event_channel_->get_servant_retry_map ().bind (this, 0); } TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void) { - this->event_channel_->get_servant_retry_map ().unbind (this); this->event_channel_->destroy_consumer_lock (this->lock_); } @@ -113,24 +110,24 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( } CORBA::Any_var any; - TAO_CEC_SupplierControl *control = - this->event_channel_->supplier_control (); - ACE_TRY { any = supplier->try_pull (has_event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - - // Inform the control that we got something from the supplier - control->successful_transmission(this); } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { + TAO_CEC_SupplierControl *control = + this->event_channel_->supplier_control (); + control->supplier_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) { + TAO_CEC_SupplierControl *control = + this->event_channel_->supplier_control (); + control->system_exception (this, sysex ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 35fae60d38e..415ae07b47e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -15,14 +15,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" -#include "event_serv_export.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "event_export.h" class TAO_CEC_EventChannel; class TAO_CEC_Dispatching; @@ -41,7 +41,7 @@ class TAO_CEC_ProxyPullSupplier; * The object commits suicide when disconnect_pull_consumer() is * called. */ -class TAO_Event_Serv_Export TAO_CEC_ProxyPullConsumer : public POA_CosEventChannelAdmin::ProxyPullConsumer +class TAO_Event_Export TAO_CEC_ProxyPullConsumer : public POA_CosEventChannelAdmin::ProxyPullConsumer { public: typedef CosEventChannelAdmin::ProxyPullConsumer_ptr _ptr_type; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index b5b75ae5f43..32cbc3086f1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -27,13 +27,10 @@ TAO_CEC_ProxyPullSupplier::TAO_CEC_ProxyPullSupplier (TAO_CEC_EventChannel* ec) this->default_POA_ = this->event_channel_->supplier_poa (); - - this->event_channel_->get_servant_retry_map ().bind (this, 0); } TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void) { - this->event_channel_->get_servant_retry_map ().unbind (this); this->event_channel_->destroy_supplier_lock (this->lock_); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 1f7a0a603d4..85922eb8922 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,7 +26,7 @@ #include "ace/Condition_Thread_Mutex.h" #include "ace/Unbounded_Queue.h" -#include "event_serv_export.h" +#include "event_export.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPullConsumer; @@ -48,7 +48,7 @@ class TAO_CEC_ProxyPullConsumer; * Locking is strategized, the event channel acts as a factory for * the locking strategies. */ -class TAO_Event_Serv_Export TAO_CEC_ProxyPullSupplier : public POA_CosEventChannelAdmin::ProxyPullSupplier +class TAO_Event_Export TAO_CEC_ProxyPullSupplier : public POA_CosEventChannelAdmin::ProxyPullSupplier { public: typedef CosEventChannelAdmin::ProxyPullSupplier_ptr _ptr_type; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index cadc6623315..434769bbb9d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -28,13 +28,10 @@ TAO_CEC_ProxyPushConsumer:: this->default_POA_ = this->event_channel_->consumer_poa (); - - this->event_channel_->get_servant_retry_map ().bind (this, 0); } TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void) { - this->event_channel_->get_servant_retry_map ().unbind (this); this->event_channel_->destroy_consumer_lock (this->lock_); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index d16697cb4bd..aee97b6f167 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -15,14 +15,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEventChannelAdminS.h" -#include "event_serv_export.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "event_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" class TAO_CEC_EventChannel; class TAO_CEC_Dispatching; @@ -41,7 +41,7 @@ class TAO_CEC_ProxyPushSupplier; * The object commits suicide when disconnect_push_consumer() is * called. */ -class TAO_Event_Serv_Export TAO_CEC_ProxyPushConsumer +class TAO_Event_Export TAO_CEC_ProxyPushConsumer : public POA_CosEventChannelAdmin::ProxyPushConsumer { public: @@ -151,7 +151,7 @@ private: * the reference count on the proxy, eliminating the need to hold * mutexes during long operations. */ -class TAO_Event_Serv_Export TAO_CEC_ProxyPushConsumer_Guard +class TAO_Event_Export TAO_CEC_ProxyPushConsumer_Guard { public: /// Constructor diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index eb188dd30f9..2deb6110383 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -10,8 +10,8 @@ #include "CEC_Dispatching.h" #include "CEC_EventChannel.h" #include "CEC_ConsumerControl.h" -#include "orbsvcs/ESF/ESF_RefCount_Guard.h" -#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" +#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" #include "tao/debug.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) #include "CEC_TypedEvent.h" @@ -46,8 +46,6 @@ TAO_CEC_ProxyPushSupplier::TAO_CEC_ProxyPushSupplier (TAO_CEC_EventChannel* ec) this->default_POA_ = this->event_channel_->supplier_poa (); - - this->event_channel_->get_servant_retry_map ().bind (this, 0); } // TAO_CEC_ProxyPushSupplier Constructure (Typed EC) @@ -63,14 +61,11 @@ TAO_CEC_ProxyPushSupplier::TAO_CEC_ProxyPushSupplier (TAO_CEC_TypedEventChannel* this->default_POA_ = this->typed_event_channel_->typed_supplier_poa (); - - this->event_channel_->get_servant_retry_map ().bind (this, 0); } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void) { - this->event_channel_->get_servant_retry_map ().unbind (this); #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) if (this->is_typed_ec () ) { @@ -603,23 +598,24 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event CosEventComm::PushConsumer::_duplicate (this->consumer_.in ()); } - TAO_CEC_ConsumerControl *control = - this->event_channel_->consumer_control (); ACE_TRY { consumer->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - - // Inform the control that we were able to push something - control->successful_transmission(this); } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) { + TAO_CEC_ConsumerControl *control = + this->event_channel_->consumer_control (); + control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) { + TAO_CEC_ConsumerControl *control = + this->event_channel_->consumer_control (); + control->system_exception (this, sysex ACE_ENV_ARG_PARAMETER); @@ -647,24 +643,24 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( CosEventComm::PushConsumer::_duplicate (this->consumer_.in ()); } - TAO_CEC_ConsumerControl *control = - this->event_channel_->consumer_control (); - ACE_TRY { consumer->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - - // Inform the control that we were able to push something - control->successful_transmission(this); } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) { + TAO_CEC_ConsumerControl *control = + this->event_channel_->consumer_control (); + control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) { + TAO_CEC_ConsumerControl *control = + this->event_channel_->consumer_control (); + control->system_exception (this, sysex ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index 1e05d9e7e41..d87dd7977dd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "event_serv_export.h" +#include "event_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -52,7 +52,7 @@ class TAO_CEC_TypedEventChannel; * Locking is strategized, the event channel acts as a factory for * the locking strategies. */ -class TAO_Event_Serv_Export TAO_CEC_ProxyPushSupplier : public POA_CosEventChannelAdmin::ProxyPushSupplier +class TAO_Event_Export TAO_CEC_ProxyPushSupplier : public POA_CosEventChannelAdmin::ProxyPushSupplier { public: typedef CosEventChannelAdmin::ProxyPushSupplier_ptr _ptr_type; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h index b4c0c970545..f1811d51f40 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -23,7 +23,7 @@ #include "tao/Objref_VarOut_T.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "orbsvcs/orbsvcs/CosEvent/event_export.h" /** * @class TAO_CEC_Pulling_Strategy @@ -36,7 +36,7 @@ * for each queue or can simply push the event to the consumer in * FIFO order. */ -class TAO_Event_Serv_Export TAO_CEC_Pulling_Strategy +class TAO_Event_Export TAO_CEC_Pulling_Strategy { public: /// destructor... diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index 795ba286da9..0fed2f2298e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -12,8 +12,6 @@ #include "CEC_ProxyPushSupplier.h" #include "CEC_ProxyPullSupplier.h" -#include "orbsvcs/Time_Utilities.h" - #include "tao/Messaging/Messaging.h" #include "tao/ORB_Core.h" @@ -30,12 +28,10 @@ ACE_RCSID (CosEvent, TAO_CEC_Reactive_ConsumerControl:: TAO_CEC_Reactive_ConsumerControl (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, - unsigned int retries, TAO_CEC_EventChannel *ec, CORBA::ORB_ptr orb) : rate_ (rate), timeout_ (timeout), - retries_ (retries), adapter_ (this), event_channel_ (ec), orb_ (CORBA::ORB::_duplicate (orb)) @@ -54,12 +50,10 @@ TAO_CEC_Reactive_ConsumerControl:: TAO_CEC_Reactive_ConsumerControl:: TAO_CEC_Reactive_ConsumerControl (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, - unsigned int retries, TAO_CEC_TypedEventChannel *ec, CORBA::ORB_ptr orb) : rate_ (rate), timeout_ (timeout), - retries_ (retries), adapter_ (this), typed_event_channel_ (ec), orb_ (CORBA::ORB::_duplicate (orb)) @@ -110,37 +104,6 @@ TAO_CEC_Reactive_ConsumerControl::query_consumers ( #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ } -bool -TAO_CEC_Reactive_ConsumerControl::need_to_disconnect ( - PortableServer::ServantBase* proxy) -{ - bool disconnect = true; - TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry; - if (this->event_channel_-> - get_servant_retry_map ().find (proxy, entry) == 0) - { - ++entry->int_id_; - if (entry->int_id_ <= this->retries_) - { - disconnect = false; - } - } - - return disconnect; -} - -void -TAO_CEC_Reactive_ConsumerControl::successful_transmission ( - PortableServer::ServantBase* proxy) -{ - TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry; - if (this->event_channel_-> - get_servant_retry_map ().find (proxy, entry) == 0) - { - entry->int_id_ = 0; - } -} - void TAO_CEC_Reactive_ConsumerControl::handle_timeout ( const ACE_Time_Value &, @@ -162,17 +125,9 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout ( ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_TRY_EX (query) - { - // Query the state of the consumers... - this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK_EX (query); - } - ACE_CATCHANY - { - // Ignore all exceptions - } - ACE_ENDTRY; + // Query the state of the consumers... + this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE @@ -208,12 +163,8 @@ TAO_CEC_Reactive_ConsumerControl::activate (void) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - // Pre-compute the policy list to the set the right timeout - // value... - // We need to convert the relative timeout into 100's of nano seconds. - TimeBase::TimeT timeout; - ORBSVCS_Time::Time_Value_to_TimeT (timeout, - this->timeout_); + // Timeout for polling state (default = 10 msec) + TimeBase::TimeT timeout = timeout_.usec() * 10; CORBA::Any any; any <<= timeout; @@ -307,11 +258,18 @@ TAO_CEC_Reactive_ConsumerControl::system_exception ( { ACE_TRY { - if (this->need_to_disconnect (proxy)) - { - proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } + // The current implementation is very strict, and kicks out a + // client on the first system exception. We may + // want to be more lenient in the future, for example, + // this is TAO's minor code for a failed connection. + // + // if (CORBA::TRANSIENT::_narrow (&exception) != 0 + // && exception->minor () == 0x54410085) + // return; + + // Anything else is serious, including timeouts... + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; } ACE_CATCHANY { @@ -363,11 +321,17 @@ TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier } ACE_CATCH (CORBA::TRANSIENT, transient) { - if (this->control_->need_to_disconnect (supplier)) - { - this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + // The current implementation is very strict, and kicks out a + // client on the first system exception. We may + // want to be more lenient in the future, for example, + // this is TAO's minor code for a failed connection. + // + // if (CORBA::TRANSIENT::_narrow (&exception) != 0 + // && exception->minor () == 0x54410085) + // return; + + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } ACE_CATCHANY { @@ -402,11 +366,17 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier } ACE_CATCH (CORBA::TRANSIENT, transient) { - if (this->control_->need_to_disconnect (supplier)) - { - this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + // The current implementation is very strict, and kicks out a + // client on the first system exception. We may + // want to be more lenient in the future, for example, + // this is TAO's minor code for a failed connection. + // + // if (CORBA::TRANSIENT::_narrow (&exception) != 0 + // && exception->minor () == 0x54410085) + // return; + + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index 43994062fd0..164e7588496 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -21,7 +21,7 @@ #include "CEC_ConsumerControl.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "tao/ORB.h" @@ -48,7 +48,7 @@ class TAO_CEC_TypedEventChannel; * periodically wakeup and verify the state of the consumers * registered with the Event Channel. */ -class TAO_Event_Serv_Export TAO_CEC_ConsumerControl_Adapter : public ACE_Event_Handler +class TAO_Event_Export TAO_CEC_ConsumerControl_Adapter : public ACE_Event_Handler { public: /// Constructor @@ -74,7 +74,7 @@ private: * = LOCKING * = TODO */ -class TAO_Event_Serv_Export TAO_CEC_Reactive_ConsumerControl +class TAO_Event_Export TAO_CEC_Reactive_ConsumerControl : public TAO_CEC_ConsumerControl { public: @@ -82,7 +82,6 @@ public: /// parameter. TAO_CEC_Reactive_ConsumerControl (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, - unsigned int retries, TAO_CEC_EventChannel *event_channel, CORBA::ORB_ptr orb); @@ -91,7 +90,6 @@ public: TAO_CEC_Reactive_ConsumerControl ( const ACE_Time_Value &rate, const ACE_Time_Value &timeout, - unsigned int retries, TAO_CEC_TypedEventChannel *typed_event_channel, CORBA::ORB_ptr orb ); @@ -115,15 +113,6 @@ public: CORBA::SystemException & ACE_ENV_ARG_DECL_NOT_USED); - /// Do we need to disconnect this supplier? The parameter type for - /// proxy is PortableServer::ServantBase* due to the fact that this - /// method will be used for TAO_CEC_ProxyPushSupplier's and - /// TAO_CEC_ProxyPullSupplier's. - virtual bool need_to_disconnect (PortableServer::ServantBase* proxy); - - /// Allow others to inform us when a send or receive was successful. - virtual void successful_transmission (PortableServer::ServantBase* proxy); - private: /// Check if the consumers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. @@ -136,9 +125,6 @@ private: /// The polling timeout ACE_Time_Value timeout_; - /// The number of retries per proxy until it is disconnected - unsigned int retries_; - /// The Adapter for the reactor events TAO_CEC_ConsumerControl_Adapter adapter_; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index 470f8a98292..dec3c06aa2f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -6,8 +6,6 @@ #include "CEC_SupplierAdmin.h" #include "CEC_ConsumerAdmin.h" -#include "orbsvcs/Time_Utilities.h" - #include "tao/Messaging/Messaging.h" #include "tao/ORB_Core.h" @@ -21,12 +19,10 @@ ACE_RCSID(CosEvent, CEC_Reactive_Pulling_Strategy, "$Id$") TAO_CEC_Reactive_Pulling_Strategy:: TAO_CEC_Reactive_Pulling_Strategy (const ACE_Time_Value &rate, - const ACE_Time_Value &relative_timeout, TAO_CEC_EventChannel *event_channel, CORBA::ORB_ptr orb) : adapter_ (this), rate_ (rate), - relative_timeout_ (relative_timeout), event_channel_ (event_channel), orb_ (CORBA::ORB::_duplicate (orb)) { @@ -55,20 +51,12 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout ( ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_TRY_EX (query) - { - TAO_CEC_Pull_Event worker (this->event_channel_->consumer_admin (), - this->event_channel_->supplier_control ()); + TAO_CEC_Pull_Event worker (this->event_channel_->consumer_admin (), + this->event_channel_->supplier_control ()); - this->event_channel_->supplier_admin ()->for_each (&worker - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (query); - } - ACE_CATCHANY - { - // Ignore all exceptions - } - ACE_ENDTRY; + this->event_channel_->supplier_admin ()->for_each (&worker + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE @@ -113,10 +101,8 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void) // Pre-compute the policy list to the set the right timeout // value... - // We need to convert the relative timeout into 100's of nano seconds. - TimeBase::TimeT timeout; - ORBSVCS_Time::Time_Value_to_TimeT (timeout, - this->relative_timeout_); + // @@ TODO It is currently hard-coded to 10 milliseconds + TimeBase::TimeT timeout = 10 * 10000; CORBA::Any any; any <<= timeout; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h index 0ee810190e2..cf38a4aa8b9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -21,10 +21,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "tao/ORB.h" -#include "tao/PolicyC.h" #include "ace/Event_Handler.h" @@ -43,7 +42,7 @@ class TAO_CEC_Reactive_Pulling_Strategy; * periodically wakeup and try top pull events from each * PullSupplier connected to the EventChannel. */ -class TAO_Event_Serv_Export TAO_CEC_Pulling_Strategy_Adapter : public ACE_Event_Handler +class TAO_Event_Export TAO_CEC_Pulling_Strategy_Adapter : public ACE_Event_Handler { public: /// Constructor @@ -68,13 +67,12 @@ private: * The events are dispatched in FIFO ordering, using the invoking * thread to push the event to the consumer. */ -class TAO_Event_Serv_Export TAO_CEC_Reactive_Pulling_Strategy : public TAO_CEC_Pulling_Strategy +class TAO_Event_Export TAO_CEC_Reactive_Pulling_Strategy : public TAO_CEC_Pulling_Strategy { public: /// The scheduler is used to find the range of priorities and similar /// info. TAO_CEC_Reactive_Pulling_Strategy (const ACE_Time_Value &rate, - const ACE_Time_Value &relative_timeout, TAO_CEC_EventChannel *event_channel, CORBA::ORB_ptr orb); @@ -93,9 +91,6 @@ private: /// The polling rate ACE_Time_Value rate_; - /// The relative timeout - ACE_Time_Value relative_timeout_; - /// The event channel TAO_CEC_EventChannel *event_channel_; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index 351b24a2fdc..f0745b949e8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -13,8 +13,6 @@ #include "CEC_ProxyPullConsumer.h" -#include "orbsvcs/Time_Utilities.h" - #include "tao/Messaging/Messaging.h" #include "tao/ORB_Core.h" @@ -31,12 +29,10 @@ ACE_RCSID (CosEvent, TAO_CEC_Reactive_SupplierControl:: TAO_CEC_Reactive_SupplierControl (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, - unsigned int retries, TAO_CEC_EventChannel *ec, CORBA::ORB_ptr orb) : rate_ (rate), timeout_ (timeout), - retries_ (retries), adapter_ (this), event_channel_ (ec), orb_ (CORBA::ORB::_duplicate (orb)) @@ -55,12 +51,10 @@ TAO_CEC_Reactive_SupplierControl:: TAO_CEC_Reactive_SupplierControl:: TAO_CEC_Reactive_SupplierControl (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, - unsigned int retries, TAO_CEC_TypedEventChannel *ec, CORBA::ORB_ptr orb) : rate_ (rate), timeout_ (timeout), - retries_ (retries), adapter_ (this), typed_event_channel_ (ec), orb_ (CORBA::ORB::_duplicate (orb)) @@ -112,37 +106,6 @@ TAO_CEC_Reactive_SupplierControl::query_suppliers ( #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ } -bool -TAO_CEC_Reactive_SupplierControl::need_to_disconnect ( - PortableServer::ServantBase* proxy) -{ - bool disconnect = true; - TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry; - if (this->event_channel_-> - get_servant_retry_map ().find (proxy, entry) == 0) - { - ++entry->int_id_; - if (entry->int_id_ <= this->retries_) - { - disconnect = false; - } - } - - return disconnect; -} - -void -TAO_CEC_Reactive_SupplierControl::successful_transmission ( - PortableServer::ServantBase* proxy) -{ - TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry; - if (this->event_channel_-> - get_servant_retry_map ().find (proxy, entry) == 0) - { - entry->int_id_ = 0; - } -} - void TAO_CEC_Reactive_SupplierControl::handle_timeout ( const ACE_Time_Value &, @@ -164,17 +127,9 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout ( ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_TRY_EX (query) - { - // Query the state of the suppliers... - this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK_EX (query); - } - ACE_CATCHANY - { - // Ignore all exceptions - } - ACE_ENDTRY; + // Query the state of the suppliers... + this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE @@ -210,12 +165,8 @@ TAO_CEC_Reactive_SupplierControl::activate (void) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - // Pre-compute the policy list to the set the right timeout - // value... - // We need to convert the relative timeout into 100's of nano seconds. - TimeBase::TimeT timeout; - ORBSVCS_Time::Time_Value_to_TimeT (timeout, - this->timeout_); + // Timeout for polling state (default = 10 msec) + TimeBase::TimeT timeout = timeout_.usec() * 10; CORBA::Any any; any <<= timeout; @@ -324,11 +275,18 @@ TAO_CEC_Reactive_SupplierControl::system_exception ( { ACE_TRY { - if (this->need_to_disconnect (proxy)) - { - proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } + // The current implementation is very strict, and kicks out a + // client on the first system exception. We may + // want to be more lenient in the future, for example, + // this is TAO's minor code for a failed connection. + // + // if (CORBA::TRANSIENT::_narrow (&exception) != 0 + // && exception->minor () == 0x54410085) + // return; + + // Anything else is serious, including timeouts... + proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; } ACE_CATCHANY { @@ -380,11 +338,18 @@ TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer } ACE_CATCH (CORBA::TRANSIENT, transient) { - if (this->control_->need_to_disconnect (consumer)) - { - this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + // The current implementation is very strict, and kicks out a + // client on the first system exception. We may + // want to be more lenient in the future, for example, + // this is TAO's minor code for a failed connection. + // + // if (CORBA::TRANSIENT::_narrow (&exception) != 0 + // && exception->minor () == 0x54410085) + // return; + + // Anything else is serious, including timeouts... + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } ACE_CATCHANY { @@ -420,11 +385,18 @@ TAO_CEC_Ping_Typed_Push_Supplier::work (TAO_CEC_TypedProxyPushConsumer *consumer } ACE_CATCH (CORBA::TRANSIENT, transient) { - if (this->control_->need_to_disconnect (consumer)) - { - this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + // The current implementation is very strict, and kicks out a + // client on the first system exception. We may + // want to be more lenient in the future, for example, + // this is TAO's minor code for a failed connection. + // + // if (CORBA::TRANSIENT::_narrow (&exception) != 0 + // && exception->minor () == 0x54410085) + // return; + + // Anything else is serious, including timeouts... + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } ACE_CATCHANY { @@ -460,11 +432,18 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer } ACE_CATCH (CORBA::TRANSIENT, transient) { - if (this->control_->need_to_disconnect (consumer)) - { - this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + // The current implementation is very strict, and kicks out a + // client on the first system exception. We may + // want to be more lenient in the future, for example, + // this is TAO's minor code for a failed connection. + // + // if (CORBA::TRANSIENT::_narrow (&exception) != 0 + // && exception->minor () == 0x54410085) + // return; + + // Anything else is serious, including timeouts... + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index bede8d09893..1aefc64bb71 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "tao/ORB.h" @@ -47,7 +47,7 @@ class TAO_CEC_TypedEventChannel; * periodically wakeup and verify the state of the suppliers * registered with the Event Channel. */ -class TAO_Event_Serv_Export TAO_CEC_SupplierControl_Adapter +class TAO_Event_Export TAO_CEC_SupplierControl_Adapter : public ACE_Event_Handler { public: @@ -74,7 +74,7 @@ private: * = LOCKING * = TODO */ -class TAO_Event_Serv_Export TAO_CEC_Reactive_SupplierControl +class TAO_Event_Export TAO_CEC_Reactive_SupplierControl : public TAO_CEC_SupplierControl { public: @@ -82,7 +82,6 @@ public: /// parameter. TAO_CEC_Reactive_SupplierControl (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, - unsigned int retries, TAO_CEC_EventChannel *event_channel, CORBA::ORB_ptr orb); @@ -91,7 +90,6 @@ public: TAO_CEC_Reactive_SupplierControl ( const ACE_Time_Value &rate, const ACE_Time_Value &timeout, - unsigned int retries, TAO_CEC_TypedEventChannel *typed_event_channel, CORBA::ORB_ptr orb ); @@ -119,15 +117,6 @@ public: CORBA::SystemException & ACE_ENV_ARG_DECL_NOT_USED); - /// Do we need to disconnect this supplier? The parameter type for - /// proxy is PortableServer::ServantBase* due to the fact that this - /// method will be used for TAO_CEC_ProxyPushSupplier's and - /// TAO_CEC_ProxyPullSupplier's. - virtual bool need_to_disconnect (PortableServer::ServantBase* proxy); - - /// Allow others to inform us when a send or receive was successful. - virtual void successful_transmission (PortableServer::ServantBase* proxy); - private: /// Check if the suppliers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. @@ -140,9 +129,6 @@ private: /// The polling timeout ACE_Time_Value timeout_; - /// The number of retries per proxy until it is disconnected - unsigned int retries_; - /// The Adapter for the reactor events TAO_CEC_SupplierControl_Adapter adapter_; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index a2837a9b7eb..1335ad5b02e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -4,7 +4,7 @@ #include "CEC_ProxyPushConsumer.h" #include "CEC_ProxyPullConsumer.h" #include "CEC_EventChannel.h" -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "CEC_SupplierAdmin.i" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index 38f312bdc53..2fdab582804 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -19,17 +19,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Proxy_Admin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h" #include "CEC_ProxyPushConsumer.h" #include "CEC_ProxyPullConsumer.h" -#include "event_serv_export.h" +#include "event_export.h" class TAO_CEC_EventChannel; @@ -49,7 +49,7 @@ class TAO_CEC_EventChannel; * externally. * = TODO */ -class TAO_Event_Serv_Export TAO_CEC_SupplierAdmin +class TAO_Event_Export TAO_CEC_SupplierAdmin : public POA_CosEventChannelAdmin::SupplierAdmin { public: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp index 788cc6b7852..28ffbd85d1e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp @@ -55,17 +55,6 @@ TAO_CEC_SupplierControl::system_exception (TAO_CEC_ProxyPullConsumer *, { } -bool -TAO_CEC_SupplierControl::need_to_disconnect (PortableServer::ServantBase*) -{ - return true; -} - -void -TAO_CEC_SupplierControl::successful_transmission (PortableServer::ServantBase*) -{ -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index 7875e543f34..b65cfc52350 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -26,10 +26,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/PortableServerC.h" #include "tao/Objref_VarOut_T.h" -#include "orbsvcs/CosEvent/event_serv_export.h" +#include "orbsvcs/orbsvcs/CosEvent/event_export.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushConsumer; @@ -55,7 +54,7 @@ namespace CORBA * = LOCKING * = TODO */ -class TAO_Event_Serv_Export TAO_CEC_SupplierControl +class TAO_Event_Export TAO_CEC_SupplierControl { public: /// Constructor. It does not assume ownership of the <event_channel> @@ -95,15 +94,6 @@ public: virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy, CORBA::SystemException & ACE_ENV_ARG_DECL_NOT_USED); - - /// Do we need to disconnect this supplier? The parameter type for - /// proxy is PortableServer::ServantBase* due to the fact that this - /// method will be used for TAO_CEC_ProxyPushSupplier's and - /// TAO_CEC_ProxyPullSupplier's. - virtual bool need_to_disconnect (PortableServer::ServantBase* proxy); - - /// Allow others to inform us when a send or receive was successful. - virtual void successful_transmission (PortableServer::ServantBase* proxy); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index 1e08da77de5..9dce04452c9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Proxy_Admin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h" #include "CEC_ProxyPushSupplier.h" #include "CEC_TypedEvent.h" @@ -30,7 +30,7 @@ class TAO_CEC_TypedEventChannel; //Class TAO_CEC_TypedConsumerAdmin -class TAO_Event_Serv_Export TAO_CEC_TypedConsumerAdmin +class TAO_Event_Export TAO_CEC_TypedConsumerAdmin : public POA_CosTypedEventChannelAdmin::TypedConsumerAdmin { public: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h index d0ee1cfa917..3eac4f3f572 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h @@ -12,7 +12,7 @@ #define TAO_CEC_TYPEDEVENT_H_ #include /**/ "ace/pre.h" -#include "event_serv_export.h" +#include "event_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -34,7 +34,7 @@ class TAO_CEC_ProxyPushSupplier; -class TAO_Event_Serv_Export TAO_CEC_TypedEvent +class TAO_Event_Export TAO_CEC_TypedEvent { public: /// constructors... diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index 1119ef34170..6db51475183 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -23,9 +23,9 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "CEC_Defaults.h" -#include "event_serv_export.h" +#include "event_export.h" -#include "orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/NVList.h" @@ -50,7 +50,7 @@ * an easy mechanism to extend the attributes without requiring * changes in the EC constructor. */ -class TAO_Event_Serv_Export TAO_CEC_TypedEventChannel_Attributes +class TAO_Event_Export TAO_CEC_TypedEventChannel_Attributes { public: /** @@ -105,7 +105,7 @@ private: class TAO_CEC_Operation_Params; //Class TAO_CEC_TypedEventChannel -class TAO_Event_Serv_Export TAO_CEC_TypedEventChannel : public virtual POA_CosTypedEventChannelAdmin::TypedEventChannel +class TAO_Event_Export TAO_CEC_TypedEventChannel : public virtual POA_CosTypedEventChannelAdmin::TypedEventChannel { public: @@ -322,7 +322,7 @@ private: }; -class TAO_Event_Serv_Export TAO_CEC_Param +class TAO_Event_Export TAO_CEC_Param { public: /// Constructor @@ -341,7 +341,7 @@ private: }; -class TAO_Event_Serv_Export TAO_CEC_Operation_Params +class TAO_Event_Export TAO_CEC_Operation_Params { /// constructor TAO_CEC_Operation_Params (CORBA::ULong num_params); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index de3210df73b..3ae216f6a4b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -16,21 +16,20 @@ #define TAO_CEC_TYPEDPROXYPUSHCONSUMER_H_ #include /**/ "ace/pre.h" -#include "orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" -#include "event_serv_export.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" class TAO_CEC_TypedEvent; class TAO_CEC_TypedEventChannel; class TAO_CEC_DynamicImplementationServer; //Class TAO_CEC_TypedProxyPushConsumer -class TAO_Event_Serv_Export TAO_CEC_TypedProxyPushConsumer +class TAO_Event_Export TAO_CEC_TypedProxyPushConsumer : public virtual POA_CosTypedEventChannelAdmin::TypedProxyPushConsumer { public: @@ -148,7 +147,7 @@ private: * the reference count on the proxy, eliminating the need to hold * mutexes during long operations. */ -class TAO_Event_Serv_Export TAO_CEC_TypedProxyPushConsumer_Guard +class TAO_Event_Export TAO_CEC_TypedProxyPushConsumer_Guard { public: /// Constructor diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h index ac42bd0ca8b..7f0d3002bc8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h @@ -19,20 +19,20 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Proxy_Admin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h" #include "CEC_TypedProxyPushConsumer.h" class TAO_CEC_TypedEventChannel; //Class TAO_CEC_TypedSupplierAdmin -class TAO_Event_Serv_Export TAO_CEC_TypedSupplierAdmin +class TAO_Event_Export TAO_CEC_TypedSupplierAdmin : public POA_CosTypedEventChannelAdmin::TypedSupplierAdmin { public: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am b/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am new file mode 100644 index 00000000000..4e1ad8fc3fb --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am @@ -0,0 +1,42 @@ +##--------------------------------------------------------------------------- +## $Id$ +## +## Makefile for TAO's CosEvent Service library +## +##--------------------------------------------------------------------------- + +## +## Process this file with automake to create Makefile.in +## + +## The number in AUTOMAKE_OPTIONS is the minimum required version automake +## needed to process this file. +AUTOMAKE_OPTIONS = 1.4 + +INCLUDES = -I$(top_builddir) -I$(top_srcdir) + +lib_LTLIBRARIES = libTAO_CosEvent.la + +libTAO_CosEvent_la_LDADD = \ + $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la + +libTAO_CosEvent_la_SOURCES = \ + ConsumerAdmin_i.cpp \ + EventChannel_i.cpp \ + ProxyPushConsumer_i.cpp \ + ProxyPushSupplier_i.cpp \ + SupplierAdmin_i.cpp + +noinst_HEADERS = \ + ConsumerAdmin_i.h \ + EventChannel_i.h \ + ProxyPushConsumer_i.h \ + ProxyPushSupplier_i.h \ + SupplierAdmin_i.h + +## Clean up some additional files/directories possibly created during +## the configure script tests. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations + diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc index 890cf8c78fc..476c061dc99 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc @@ -1,9 +1,9 @@ // -*- MPC -*- // $Id$ -project(CosLifeCycle) : orbsvcslib, core, naming, portableserver { +project(CosLifeCycle) : orbsvcslib, core, naming { sharedname = TAO_CosLifeCycle - idlflags += -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h + idlflags += -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h dynamicflags = TAO_LIFECYCLE_BUILD_DLL tagchecks += LifeCycle pch_header = @@ -22,7 +22,4 @@ project(CosLifeCycle) : orbsvcslib, core, naming, portableserver { LifeCycleServiceS.cpp } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc index d84a404cbb4..4c8b075c744 100644 --- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc @@ -1,11 +1,12 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, iorinterceptor { +project : orbsvcslib, core, naming, iormanip, portablegroup, ami { sharedname = TAO_CosLoadBalancing - idlflags += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h + idlflags += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h dynamicflags = TAO_LOADBALANCING_BUILD_DLL tagchecks += CosLoadBalancing + avoids += minimum_corba IDL_Files { CosLoadBalancing.idl @@ -45,7 +46,4 @@ project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, LoadBalancing/LB_CPU_Load_Average_Monitor.cpp } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc index 9a79a63353b..86c088dc574 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc @@ -1,80 +1,28 @@ // -*- MPC -*- // $Id$ -project(CosNaming) : orbsvcslib, core { +project(CosNaming) : orbsvcslib, core, messaging, svc_utils, iortable { sharedname = TAO_CosNaming + idlflags += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h dynamicflags = TAO_NAMING_BUILD_DLL - - idlflags += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h - - IDL_Files { - CosNaming.idl - } - - Source_Files { - CosNamingC.cpp - Naming/Naming_Client.cpp - } - - Header_Files { - CosNamingC.h - Naming/Naming_Client.h - } - - Inline_Files { - CosNamingC.inl - } - - Template_Files { - } - - // explicit Resource_Files to avoid including _Skel & _Serv rc files. - Resource_Files{ - CosNaming.rc - } -} - - -project(CosNaming_Skel) : orbsvcslib, core, naming, portableserver { - sharedname = TAO_CosNaming_Skel - dynamicflags = TAO_NAMING_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CosNamingS.cpp - } - - Header_Files { - CosNamingS.h - } - - Inline_Files { - CosNamingS.inl - } - - Template_Files { - } -} - - -project(CosNaming_Serv) : orbsvcslib, core, naming_skel, messaging, svc_utils, iortable { - sharedname = TAO_CosNaming_Serv - dynamicflags = TAO_NAMING_SERV_BUILD_DLL tagchecks += Naming + libs += TAO_Messaging + after += Messaging IDL_Files { + CosNaming.idl } Source_Files(ORBSVCS_COMPONENTS) { Naming { + CosNamingC.cpp + CosNamingS.cpp Naming/Entries.cpp Naming/Flat_File_Persistence.cpp Naming/Hash_Naming_Context.cpp Naming/Naming_Context_Interface.cpp Naming/Naming_Loader.cpp - Naming/Naming_Server.cpp + Naming/Naming_Utils.cpp Naming/Persistent_Context_Index.cpp Naming/Persistent_Entries.cpp Naming/Persistent_Naming_Context.cpp @@ -84,12 +32,8 @@ project(CosNaming_Serv) : orbsvcslib, core, naming_skel, messaging, svc_utils, i Naming/Transient_Naming_Context.cpp } } - + Header_Files { - Naming/naming_export.h - Naming/Naming_Server.h - } - - Template_Files { + Naming/naming_export.h } } diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index fc66a4e7789..da02aae1353 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -1,13 +1,22 @@ // -*- MPC -*- // $Id$ -project(CosNotification) : orbsvcslib, core, event { +project(CosNotification) : orbsvcslib, core, svc_utils, etcl, dynamicany { sharedname = TAO_CosNotification - dynamicflags = TAO_NOTIFY_BUILD_DLL + // Warning : The idlflags must match exactly those used in CosEvent, because + // we don't know which project will actually generate the IDL. + // For this reason we also just use the event_export.h and macros for + // both services. + idlflags += -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h - idlflags += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h + // Set both DLL flags because of the shared idl files + dynamicflags = TAO_NOTIFY_BUILD_DLL TAO_EVENT_BUILD_DLL + + tagchecks += Notify IDL_Files { + CosEventComm.idl + CosEventChannelAdmin.idl CosNotification.idl CosNotifyComm.idl CosNotifyFilter.idl @@ -16,96 +25,27 @@ project(CosNotification) : orbsvcslib, core, event { Event_Forwarder.idl } - Source_Files { - CosNotificationC.cpp - CosNotifyCommC.cpp - CosNotifyFilterC.cpp - CosNotifyChannelAdminC.cpp - NotifyExtC.cpp - Event_ForwarderC.cpp - Notify/Notify_Extensions.cpp - } - - Header_Files { - CosNotificationC.h - CosNotifyCommC.h - CosNotifyFilterC.h - CosNotifyChannelAdminC.h - NotifyExtC.h - Event_ForwarderC.h - Notify/Notify_Extensions.h - } - - Inline_Files { - CosNotificationC.inl - CosNotifyCommC.inl - CosNotifyFilterC.inl - CosNotifyChannelAdminC.inl - NotifyExtC.inl - Event_ForwarderC.inl - } - - Template_Files { - } - - // explicit Resource_Files to avoid including _Skel & _Serv rc files. - Resource_Files{ - CosNotification.rc - } -} - - -project(CosNotification_Skel) : orbsvcslib, core, notification, event_skel, portableserver { - sharedname = TAO_CosNotification_Skel - dynamicflags = TAO_NOTIFY_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CosNotificationS.cpp - CosNotifyCommS.cpp - CosNotifyFilterS.cpp - CosNotifyChannelAdminS.cpp - NotifyExtS.cpp - Event_ForwarderS.cpp - } - - Header_Files { - CosNotificationS.h - CosNotifyCommS.h - CosNotifyFilterS.h - CosNotifyChannelAdminS.h - NotifyExtS.h - Event_ForwarderS.h - } - - Inline_Files { - CosNotificationS.inl - CosNotifyCommS.inl - CosNotifyFilterS.inl - CosNotifyChannelAdminS.inl - NotifyExtS.inl - Event_ForwarderS.inl - } - - Template_Files { - } -} - -project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany, etcl { - sharedname = TAO_CosNotification_Serv - dynamicflags = TAO_NOTIFY_SERV_BUILD_DLL - tagchecks += Notify - - IDL_Files { - } - // The following could be simplified if RT stuff was // put into another subdirectory. Source_Files(ORBSVCS_COMPONENTS) { Notify { + CosEventCommC.cpp + CosEventCommS.cpp + CosEventChannelAdminC.cpp + CosEventChannelAdminS.cpp + CosNotificationC.cpp + CosNotificationS.cpp + CosNotifyCommC.cpp + CosNotifyCommS.cpp + CosNotifyFilterC.cpp + CosNotifyFilterS.cpp + CosNotifyChannelAdminC.cpp + CosNotifyChannelAdminS.cpp + NotifyExtC.cpp + NotifyExtS.cpp + Event_ForwarderC.cpp + Event_ForwarderS.cpp Notify/Admin.cpp Notify/AdminProperties.cpp Notify/Buffering_Strategy.cpp @@ -138,6 +78,7 @@ project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany, Notify/Notify_Default_EMO_Factory.cpp Notify/Notify_Default_POA_Factory.cpp Notify/Notify_EventChannelFactory_i.cpp + Notify/Notify_Extensions.cpp Notify/Object.cpp Notify/Peer.cpp Notify/POA_Helper.cpp @@ -176,7 +117,4 @@ project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany, Notify/Structured/StructuredPushSupplier.cpp } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl index b792ae547ff..db0a937548b 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl +++ b/TAO/orbsvcs/orbsvcs/CosNotifyChannelAdmin.idl @@ -306,8 +306,6 @@ module CosNotifyChannelAdmin raises(CosEventChannelAdmin::AlreadyConnected); }; -#ifdef TAO_HAS_NOTIFY_PULL_INTERFACES - /** * @interface ProxyPullSupplier * @@ -535,7 +533,6 @@ module CosNotifyChannelAdmin void resume_connection() raises(ConnectionAlreadyActive, NotConnected); }; -#endif /* TAO_HAS_NOTIFY_PULL_INTERFACES */ /** * @interface ProxyPushSupplier diff --git a/TAO/orbsvcs/orbsvcs/CosNotifyComm.idl b/TAO/orbsvcs/orbsvcs/CosNotifyComm.idl index e5787489790..ae841bf6106 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotifyComm.idl +++ b/TAO/orbsvcs/orbsvcs/CosNotifyComm.idl @@ -289,9 +289,7 @@ module CosNotifyComm void disconnect_sequence_push_consumer(); }; -#ifdef TAO_HAS_NOTIFY_PULL_INTERFACES - -/** + /** * @interface SequencePullConsumer * * @brief Defines the interface used by pull-style consumers that @@ -356,8 +354,6 @@ module CosNotifyComm void disconnect_sequence_pull_supplier(); }; -#endif /* TAO_HAS_NOTIFY_PULL_INTERFACES */ - /** * @interface SequencePushSupplier * diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc index fb763f50750..d452d9bbe33 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc +++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc @@ -3,7 +3,7 @@ project(CosProperty) : orbsvcslib, core, portableserver { sharedname = TAO_CosProperty - idlflags += -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h + idlflags += -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property/property_export.h dynamicflags = TAO_PROPERTY_BUILD_DLL tagchecks += Property pch_header = @@ -20,7 +20,4 @@ project(CosProperty) : orbsvcslib, core, portableserver { Property } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc index f2e902b1e3f..5ff59656a4f 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc @@ -1,9 +1,9 @@ // -*- MPC -*- // $Id$ -project(CosTime) : orbsvcslib, core, portableserver { +project(CosTime) : orbsvcslib, core, naming { sharedname = TAO_CosTime - idlflags += -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h + idlflags += -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h dynamicflags = TAO_TIME_BUILD_DLL tagchecks += Time @@ -18,7 +18,4 @@ project(CosTime) : orbsvcslib, core, portableserver { Time } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index 9965e4208f0..20e679e0ddb 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -1,95 +1,29 @@ // -*- MPC -*- // $Id$ -project(CosTrading) : orbsvcslib, core { +project(CosTrading) : orbsvcslib, core, dynamicany, svc_utils { sharedname = TAO_CosTrading + idlflags += -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h dynamicflags = TAO_TRADING_BUILD_DLL - - idlflags += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h - - IDL_Files { - CosTrading.idl - CosTradingRepos.idl - CosTradingDynamic.idl - } - - Source_Files { - CosTradingC.cpp - CosTradingReposC.cpp - CosTradingDynamicC.cpp - } - - Header_Files { - CosTradingC.h - CosTradingReposC.h - CosTradingDynamicC.h - } - - Inline_Files { - CosTradingC.inl - CosTradingReposC.inl - CosTradingDynamicC.inl - } - - Template_Files { - } - - // explicit Resource_Files to avoid including _Skel & _Serv rc files. - Resource_Files { - CosTrading.rc - } -} - - -project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver { - sharedname = TAO_CosTrading_Skel - dynamicflags = TAO_TRADING_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CosTradingS.cpp - CosTradingReposS.cpp - CosTradingDynamicS.cpp - } - - Header_Files { - CosTradingS.h - CosTradingReposS.h - CosTradingDynamicS.h - } - - Inline_Files { - CosTradingS.inl - CosTradingReposS.inl - CosTradingDynamicS.inl - } - - Template_Files { - } -} - - -project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils { - sharedname = TAO_CosTrading_Serv - dynamicflags = TAO_TRADING_SERV_BUILD_DLL tagchecks += Trader pch_header = pch_source = IDL_Files { + CosTrading.idl + CosTradingRepos.idl + CosTradingDynamic.idl } Source_Files(ORBSVCS_COMPONENTS) { Trader { + CosTradingC.cpp + CosTradingS.cpp + CosTradingReposC.cpp + CosTradingReposS.cpp + CosTradingDynamicC.cpp + CosTradingDynamicS.cpp Trader } } - - Inline_Files { - } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc index caa107460b7..c1a703820bd 100644 --- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc @@ -3,78 +3,24 @@ project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event { sharedname = TAO_DsEventLogAdmin + idlflags += -Wb,export_macro=TAO_EventLog_Export -Wb,export_include=Log/eventlog_export.h dynamicflags = TAO_EVENTLOG_BUILD_DLL - - idlflags += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h - - IDL_Files { - DsEventLogAdmin.idl - } - - Source_Files { - DsEventLogAdminC.cpp - } - - Header_Files { - DsEventLogAdminC.h - } - - Inline_Files { - DsEventLogAdminC.inl - } - - Template_Files { - } - - // explicit Resource_Files to avoid including _Skel & _Serv rc files. - Resource_Files { - DsEventLogAdmin.rc - } -} - -project(DsEventLogAdmin_Skel) : orbsvcslib, core, dseventlogadmin, dslogadmin_skel, event_skel, portableserver { - sharedname = TAO_DsEventLogAdmin_Skel - dynamicflags = TAO_EVENTLOG_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DsEventLogAdminS.cpp - } - - Header_Files { - DsEventLogAdminS.h - } - - Inline_Files { - DsEventLogAdminS.inl - } - - Template_Files { - } -} - -project(DsEventLogAdmin_Serv) : orbsvcslib, core, dseventlogadmin_skel, dslogadmin_serv, event_serv { - sharedname = TAO_DsEventLogAdmin_Serv - dynamicflags = TAO_EVENTLOG_SERV_BUILD_DLL tagchecks += EventLog + pch_header = + pch_source = IDL_Files { + DsEventLogAdmin.idl } Source_Files(ORBSVCS_COMPONENTS) { DsEventLogAdmin { - Log/EventLogConsumer.cpp + DsEventLogAdminC.cpp + DsEventLogAdminS.cpp Log/EventLogFactory_i.cpp - Log/EventLogNotification.cpp Log/EventLog_i.cpp + Log/EventLogConsumer.cpp + Log/EventLogNotification.cpp } } - - Inline_Files { - } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc index 7ebf84be185..6f147ab0a53 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc @@ -1,95 +1,35 @@ // -*- MPC -*- // $Id$ -project(DsLogAdmin) : orbsvcslib, core { +project(DsLogAdmin) : orbsvcslib, core, etcl, naming, dynamicany { sharedname = TAO_DsLogAdmin + idlflags += -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h dynamicflags = TAO_LOG_BUILD_DLL - - idlflags += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h + tagchecks += Log + pch_header = + pch_source = IDL_Files { DsLogAdmin.idl DsLogNotification.idl } - Source_Files { - DsLogAdminC.cpp - DsLogNotificationC.cpp - } - - Header_Files { - DsLogAdminC.h - DsLogNotificationC.h - } - - Inline_Files { - DsLogAdminC.inl - DsLogNotificationC.inl - } - - Template_Files { - } - - // explicit Resource_Files to avoid including _Skel & _Serv rc files. - Resource_Files { - DsLogAdmin.rc - } -} - - -project(DsLogAdmin_Skel) : orbsvcslib, core, dslogadmin, portableserver { - sharedname = TAO_DsLogAdmin_Skel - dynamicflags = TAO_LOG_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DsLogAdminS.cpp - DsLogNotificationS.cpp - } - - Header_Files { - DsLogAdminS.h - DsLogNotificationS.h - } - - Inline_Files { - DsLogAdminS.inl - DsLogNotificationS.inl - } - - Template_Files { - } -} - - -project(DsLogAdmin_Serv) : orbsvcslib, core, dslogadmin_skel, dynamicany, etcl, svc_utils { - sharedname = TAO_DsLogAdmin_Serv - dynamicflags = TAO_LOG_SERV_BUILD_DLL - tagchecks += Log - - IDL_Files { - } - Source_Files(ORBSVCS_COMPONENTS) { DsLogAdmin { + DsLogAdminC.cpp + DsLogAdminS.cpp + DsLogNotificationC.cpp + DsLogNotificationS.cpp + Log/PersistStore.cpp + Log/LogRecordStore.cpp Log/BasicLogFactory_i.cpp - Log/BasicLog_i.cpp Log/Iterator_i.cpp + Log/BasicLog_i.cpp + Log/Log_i.cpp Log/LogMgr_i.cpp - Log/LogNotification.cpp - Log/LogRecordStore.cpp - Log/Log_Constraint_Interpreter.cpp Log/Log_Constraint_Visitors.cpp - Log/Log_i.cpp - Log/PersistStore.cpp + Log/Log_Constraint_Interpreter.cpp + Log/LogNotification.cpp } } - - Inline_Files { - } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc index 4c0b1ad5ae5..dbf23ddfcc1 100644 --- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc @@ -1,81 +1,26 @@ // -*- MPC -*- // $Id$ -project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification { +project(DsNotifyLogAdmin) : orbsvcslib, core, dseventlogadmin, notification { sharedname = TAO_DsNotifyLogAdmin + idlflags += -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=Log/notifylog_export.h dynamicflags = TAO_NOTIFYLOG_BUILD_DLL - - idlflags += -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h - - IDL_Files { - DsNotifyLogAdmin.idl - } - - Source_Files { - DsNotifyLogAdminC.cpp - } - - Header_Files { - DsNotifyLogAdminC.h - } - - Inline_Files { - DsNotifyLogAdminC.inl - } - - Template_Files { - } - - // explicit Resource_Files to avoid including _Skel & _Serv rc files. - Resource_Files { - DsNotifyLogAdmin.rc - } -} - -project(DsNotifyLogAdmin_Skel) : orbsvcslib, core, dsnotifylogadmin, dseventlogadmin_skel, dslogadmin_skel, event_skel, notification_skel, portableserver { - sharedname = TAO_DsNotifyLogAdmin_Skel - dynamicflags = TAO_NOTIFYLOG_SKEL_BUILD_DLL - - IDL_Files { - } - - Source_Files { - DsNotifyLogAdminS.cpp - } - - Header_Files { - DsNotifyLogAdminS.h - } - - Inline_Files { - DsNotifyLogAdminS.inl - } - - Template_Files { - } -} - - -project(DsNotifyLogAdmin_Serv) : orbsvcslib, core, dsnotifylogadmin_skel, dslogadmin_serv { - sharedname = TAO_DsNotifyLogAdmin_Serv - dynamicflags = TAO_NOTIFYLOG_SERV_BUILD_DLL tagchecks += Log + pch_header = + pch_source = IDL_Files { + DsNotifyLogAdmin.idl } Source_Files(ORBSVCS_COMPONENTS) { DsNotifyLogAdmin { - Log/NotifyLogConsumer.cpp + DsNotifyLogAdminC.cpp + DsNotifyLogAdminS.cpp Log/NotifyLogFactory_i.cpp - Log/NotifyLogNotification.cpp Log/NotifyLog_i.cpp + Log/NotifyLogConsumer.cpp + Log/NotifyLogNotification.cpp } } - - Inline_Files { - } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/ETCL.mpc b/TAO/orbsvcs/orbsvcs/ETCL.mpc index 64d99791382..9d8b3841373 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL.mpc +++ b/TAO/orbsvcs/orbsvcs/ETCL.mpc @@ -14,7 +14,4 @@ project(ETCL) : orbsvcslib, core { Source_Files { ETCL } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp index 0e781c19364..6c49661a2b5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp @@ -1,8 +1,8 @@ // $Id$ #include "ace/Sched_Params.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "Memory_Pools.h" #include "Dispatching_Modules.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h index 03869de539b..459feed2c99 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h @@ -23,9 +23,9 @@ #include "ace/Reactor_Notification_Strategy.h" #include "tao/Timeprobe.h" -#include "orbsvcs/Event/ReactorTask.h" -#include "orbsvcs/Event/Event_Manip.h" -#include "orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/ReactorTask.h" +#include "orbsvcs/orbsvcs/Event/Event_Manip.h" +#include "orbsvcs/orbsvcs/Event/Event_Channel.h" // ************************************************************ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h index 6a3a4298e83..cc1ae3e6bd7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" #include /**/ "event_export.h" -#include "orbsvcs/RtecUDPAdminC.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h index 533e6ba7391..eb356e86e3c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" #include /**/ "event_export.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" #include "EC_Lifetime_Utils.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h index 80c73e8db91..324a485eaf6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h @@ -21,7 +21,7 @@ #include /**/ "event_export.h" -#include "tao/SystemException.h" +#include "tao/Exception.h" #include "tao/Environment.h" #include "ace/INET_Addr.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h index f8441511cf4..ee28910bbf3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h @@ -16,7 +16,7 @@ #include /**/ "event_export.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/INET_Addr.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 5c52c8e7b3c..80f6a1cd40f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Event/ECG_Mcast_EH.h" -#include "orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h" #include "ace/Unbounded_Set.h" #include "ace/OS_NS_string.h" #include "ace/Reactor.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index 25f55f68033..f62de40073a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -26,7 +26,7 @@ #include "ace/Array_Base.h" #include "ace/SOCK_Dgram_Mcast.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #include /**/ "event_export.h" #include "ECG_Adapters.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index 773e41b0041..d76f722ade2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -9,7 +9,7 @@ #include "ECG_Mcast_EH.h" #include "ECG_UDP_EH.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h index 5f7a01f5346..4d29843669b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h @@ -20,8 +20,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/ORB.h" -#include "tao/PolicyC.h" - #include "ace/Event_Handler.h" @@ -68,9 +66,9 @@ public: /// Constructor. It does not assume ownership of the @a event_channel /// parameter. TAO_ECG_Reactive_ConsumerEC_Control (const ACE_Time_Value &rate, - const ACE_Time_Value &timeout, - TAO_EC_Gateway_IIOP* gateway, - CORBA::ORB_ptr orb); + const ACE_Time_Value &timeout, + TAO_EC_Gateway_IIOP* gateway, + CORBA::ORB_ptr orb); /// Destructor. virtual ~TAO_ECG_Reactive_ConsumerEC_Control (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h index c24dacb2872..16a43c799d7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h @@ -20,7 +20,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/ORB.h" -#include "tao/PolicyC.h" #include "ace/Event_Handler.h" @@ -72,9 +71,9 @@ public: /// Constructor. It does not assume ownership of the @a event_channel /// parameter. TAO_ECG_Reconnect_ConsumerEC_Control (const ACE_Time_Value &rate, - const ACE_Time_Value &timeout, - TAO_EC_Gateway_IIOP* gateway, - CORBA::ORB_ptr orb); + const ACE_Time_Value &timeout, + TAO_EC_Gateway_IIOP* gateway, + CORBA::ORB_ptr orb); /// Destructor. virtual ~TAO_ECG_Reconnect_ConsumerEC_Control (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h index 502b3a555d9..b71c9fbe8bf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h @@ -12,7 +12,7 @@ #define TAO_ECG_SIMPLE_ADDRESS_SERVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" #include "EC_Lifetime_Utils_T.h" #include "ace/INET_Addr.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp index 434bbd649a7..79c24624b7e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp @@ -38,7 +38,7 @@ TAO_ECG_UDP_Out_Endpoint::is_loopback (const ACE_INET_Addr& from) if (this->ifs_ == 0) { - ACE::get_ip_interfaces (this->if_count_, this->ifs_); + ACE_Sock_Connect::get_ip_interfaces (this->if_count_, this->ifs_); } for (ACE_INET_Addr* i = this->ifs_; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index 0fdccc40c53..075682e983e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "ace/SString.h" #if !defined(__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 68090d4b7aa..8e142825d7a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -37,13 +37,13 @@ #define TAO_ECG_UDP_RECEIVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #include /**/ "event_export.h" #include "ECG_Adapters.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index d111b4d8470..d25efcb56ca 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -9,8 +9,8 @@ * */ -#include "orbsvcs/Event/ECG_UDP_Sender.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "tao/CDR.h" #if !defined(__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 00b1a6181b2..ee872d01530 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -38,14 +38,14 @@ #define TAO_ECG_UDP_SENDER_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ "event_export.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #include "EC_Lifetime_Utils.h" #include "EC_Lifetime_Utils_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index 7eb7b9fac4f..6bfc17ea60f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -15,8 +15,8 @@ #include "EC_Reactive_SupplierControl.h" #include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug -#include "orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/ESF/ESF_Delayed_Changes.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index b1b7b1ca222..193b672ec46 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "EC_Basic_Filter_Builder.h" #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index d27e7203e8a..1b846220c81 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -4,9 +4,9 @@ #include "EC_ProxySupplier.h" #include "EC_ProxyConsumer.h" #include "EC_Event_Channel_Base.h" -#include "orbsvcs/ESF/ESF_Peer_Workers.h" -#include "orbsvcs/ESF/ESF_Peer_Admin.h" -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "EC_ConsumerAdmin.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h index 60b5edadb24..909dad88229 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index 61adaf515d7..9d33bbecd68 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -19,13 +19,13 @@ #include "EC_Reactive_ConsumerControl.h" #include "EC_Reactive_SupplierControl.h" -#include "orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h" -#include "orbsvcs/ESF/ESF_Immediate_Changes.h" -#include "orbsvcs/ESF/ESF_Copy_On_Read.h" -#include "orbsvcs/ESF/ESF_Copy_On_Write.h" -#include "orbsvcs/ESF/ESF_Delayed_Changes.h" -#include "orbsvcs/ESF/ESF_Delayed_Command.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h index 853b7e04a93..a14c68925e1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h index dfbe23bfd05..d028e06a00d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h index 54ea96405e4..bae7d4eb094 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index 113c5a7b1ad..067e33340cf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" #include /**/ "event_export.h" #include "ace/Task.h" #include "ace/Message_Block.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h index 44d548e8693..dd0799e5752 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h @@ -27,7 +27,7 @@ #include "EC_Defaults.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" template<class> class TAO_ESF_Worker; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h index ac2f8c4988c..123a78382a0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h index 33c8c9cfb7a..be40d293ce0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp index 8ef8d8c7ef0..a97cd55b4ce 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Event/EC_Gateway.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway.h" ACE_RCSID (Event, EC_Gateway, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h index ff55b4ca46f..a8863961edb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h @@ -19,8 +19,8 @@ #include /**/ "event_export.h" -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" /** * @class TAO_EC_Gateway diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index 91e25f95e96..6202e72db2c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_Gateway_IIOP.h" -#include "orbsvcs/Event/ECG_Defaults.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h" +#include "orbsvcs/orbsvcs/Event/ECG_Defaults.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "EC_Gateway_IIOP_Factory.h" #include "ECG_ConsumerEC_Control.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h index 06f2d805dfa..058fc1b4696 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h @@ -22,9 +22,9 @@ #include /**/ "event_export.h" #include "EC_Gateway.h" -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/Channel_Clients.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/Channel_Clients.h" #include "ace/Map_Manager.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index eb368de2dbb..8e4347a7bc7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h" -#include "orbsvcs/Event/ECG_Defaults.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h" +#include "orbsvcs/orbsvcs/Event/ECG_Defaults.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp index cb8453bdef8..80835d4dde4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -1,7 +1,7 @@ // $Id$ #include "EC_Gateway_Sched.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" ACE_RCSID (Event, EC_Gateway_sched, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h index 3ab5e935271..c207596ae00 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" #include "EC_Gateway_IIOP.h" -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "sched_event_export.h" // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index 2ad2a374996..b1a36867648 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -5,8 +5,8 @@ #include "EC_ProxySupplier.h" #include "EC_QOS_Info.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "tao/ORB_Constants.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h index ec54bc03226..abd145b2b3f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "rtkokyu_event_export.h" #include "ace/Thread_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp index a40af3f6c2a..0dc7d4e18a0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -5,7 +5,7 @@ #include "EC_Kokyu_Scheduling.h" #include "EC_Kokyu_Filter_Builder.h" #include "EC_Event_Channel_Base.h" -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h index 55d64cdb2c9..5c1cd2b04d7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "rtkokyu_event_export.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp index 5fce1a7cab8..fd9ebe4715b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp @@ -1,7 +1,7 @@ // $Id$ #include "EC_Kokyu_Filter.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "EC_Kokyu_Filter_Builder.h" #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h index 5eb6ef5dc35..f07a37c374c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "rtkokyu_event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h index 8efb85c2d98..39c2d42020b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" #include /**/ "event_export.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "tao/PortableServer/PortableServerC.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index e9df4b4298e..841bd6656c7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp @@ -14,8 +14,8 @@ #include "EC_ConsumerControl.h" #include "EC_SupplierControl.h" #include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug -#include "orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/ESF/ESF_Immediate_Changes.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 3149420a6f1..6b0af4e85dd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -6,7 +6,7 @@ #include "EC_ProxyConsumer.h" #include "EC_ConsumerAdmin.h" #include "EC_SupplierAdmin.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "ace/Auto_Ptr.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h index 5bca0bf2172..6d33cfea8c6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ #include "ace/RB_Tree.h" #include "ace/Map_Manager.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index 1eb2794a909..e0add81915f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -7,9 +7,9 @@ #include "EC_Scheduling_Strategy.h" #include "EC_QOS_Info.h" -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) #include "EC_Per_Supplier_Filter.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index ed97744f809..8a3879662f4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "EC_Prefix_Filter_Builder.h" #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index 53f7634ce00..ade0f194676 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -5,8 +5,8 @@ #include "EC_Event_Channel_Base.h" #include "EC_QOS_Info.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h index 717fad35865..b8156a664e1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "sched_event_export.h" #include "ace/Thread_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h index a8a1fee8960..45bed1bbf9c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "sched_event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index 75718ee9895..82a0162f440 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -19,7 +19,7 @@ #include /**/ "event_export.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index ea22992bf90..00d0b81e4a6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -8,8 +8,8 @@ #include "EC_Scheduling_Strategy.h" #include "EC_ConsumerControl.h" #include "EC_SupplierAdmin.h" -#include "orbsvcs/ESF/ESF_RefCount_Guard.h" -#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" +#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" #include "ace/Reverse_Lock_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index 552383c96d9..590d5c61190 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #include "EC_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h index dce214ba29d..559b3497f8b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h @@ -9,7 +9,7 @@ #define EC_PROXY_DISCONNECTOR__H_ #include /**/ "event_export.h" -#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" #include "ace/Auto_Functor.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h index 0fbc4fe9290..25a37802392 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecBaseC.h" +#include "orbsvcs/orbsvcs/RtecBaseC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h index 26f9df5c53a..06929bcf071 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h @@ -23,10 +23,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "tao/ORB.h" -#include "tao/PolicyC.h" #include "ace/Event_Handler.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h index 6ae7fb8594c..f1885974944 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h @@ -19,14 +19,13 @@ #include "EC_SupplierControl.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/ORB.h" -#include "tao/PolicyC.h" #include "ace/Event_Handler.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index 0199dec1957..92a0da41ec3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -5,7 +5,7 @@ #include "EC_Priority_Scheduling.h" #include "EC_Sched_Filter_Builder.h" #include "EC_Event_Channel_Base.h" -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h index c1093401be5..f556b0f1d8b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "sched_event_export.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 6b2815e4897..5e153f1bcb1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -1,7 +1,7 @@ // $Id$ #include "EC_Sched_Filter.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "EC_Sched_Filter_Builder.h" #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h index 29c94f4f892..b89992dcba1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h @@ -19,8 +19,8 @@ #include /**/ "event_export.h" -#include "orbsvcs/RtecBaseC.h" -#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/RtecBaseC.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index 39d04fec297..585fd0076e3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -4,9 +4,9 @@ #include "EC_ProxyConsumer.h" #include "EC_ProxySupplier.h" #include "EC_Event_Channel_Base.h" -#include "orbsvcs/ESF/ESF_Peer_Workers.h" -#include "orbsvcs/ESF/ESF_Peer_Admin.h" -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "EC_SupplierAdmin.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h index 91572785bc2..47956d2f32c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h index b4318075078..0d80ad03c9e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h @@ -17,8 +17,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventCommC.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h index 88a25804797..534752a9eaf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index e4e812f95b9..dba117af1c6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -4,8 +4,8 @@ #include "EC_Timeout_Generator.h" #include "EC_Event_Channel_Base.h" #include "EC_ProxySupplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) #include "EC_Timeout_Filter.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index 4373aef1b62..fdbe46377ab 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -2,7 +2,7 @@ #include "EC_Timeout_Generator.h" #include "EC_Timeout_Filter.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) #include "EC_Timeout_Generator.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index 37374a6f760..f037d3df588 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Event/EC_UDP_Admin.h" +#include "orbsvcs/orbsvcs/Event/EC_UDP_Admin.h" ACE_RCSID (Event, EC_UDP_Admin, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h index 5cccfec538c..89588a49864 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h @@ -16,7 +16,7 @@ #define TAO_EC_UDP_ADMIN_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" #include /**/ "event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp index 65bbe15ddd5..9360d98f57e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp @@ -2,15 +2,15 @@ #include "ace/Service_Config.h" #include "ace/Auto_Ptr.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Event_Utilities.h" - -#include "orbsvcs/Event/Dispatching_Modules.h" -#include "orbsvcs/Event/Memory_Pools.h" -#include "orbsvcs/Event/EC_Gateway.h" -#include "orbsvcs/Event/Module_Factory.h" -#include "orbsvcs/Event/Event_Manip.h" -#include "orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" + +#include "orbsvcs/orbsvcs/Event/Dispatching_Modules.h" +#include "orbsvcs/orbsvcs/Event/Memory_Pools.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway.h" +#include "orbsvcs/orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/orbsvcs/Event/Event_Manip.h" +#include "orbsvcs/orbsvcs/Event/Event_Channel.h" #if !defined (__ACE_INLINE__) #include "Event_Channel.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h index 30e0d418536..a6c4709a9c9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h @@ -40,11 +40,11 @@ #include "tao/Timeprobe.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Event/Local_ESTypes.h" -#include "orbsvcs/Event/Timer_Module.h" -#include "orbsvcs/Event/ReactorTask.h" -#include "orbsvcs/Event/Event_Manip.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Event/Local_ESTypes.h" +#include "orbsvcs/orbsvcs/Event/Timer_Module.h" +#include "orbsvcs/orbsvcs/Event/ReactorTask.h" +#include "orbsvcs/orbsvcs/Event/Event_Manip.h" // ************************************************************ diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp index 0d8e97cb479..de495fe73e4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp @@ -8,7 +8,7 @@ // // ============================================================================ -#include "orbsvcs/Event/Event_Manip.h" +#include "orbsvcs/orbsvcs/Event/Event_Manip.h" #if !defined (__ACE_INLINE__) #include "Event_Manip.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h index b78511867b5..b087dc2ce4a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h @@ -21,7 +21,7 @@ #define TAO_EC_EVENT_MANIP_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" #include "old_event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h index 60d8ac8c459..a7490392d68 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h +++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h @@ -22,14 +22,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event_Service_Constants.h" - -#include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/RtecEventCommC.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" + +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #define ACE_DEFAULT_EVENT_CHANNEL_TYPE 0 diff --git a/TAO/orbsvcs/orbsvcs/Event/Makefile.am b/TAO/orbsvcs/orbsvcs/Event/Makefile.am new file mode 100644 index 00000000000..1b362fdb7e9 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Event/Makefile.am @@ -0,0 +1,163 @@ +##--------------------------------------------------------------------------- +## $Id$ +## +## Makefile for TAO's Event Channel library +## +##--------------------------------------------------------------------------- + +## +## Process this file with automake to create Makefile.in +## + +## The number in AUTOMAKE_OPTIONS is the minimum required version automake +## needed to process this file. +AUTOMAKE_OPTIONS = 1.4 + +INCLUDES = -I$(top_builddir) -I$(top_srcdir) + +lib_LTLIBRARIES = libTAO_Event.la + +libTAO_Event_la_LDADD = \ + $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la + +libTAO_Event_la_SOURCES = \ + BCU.cpp \ + Dispatching_Modules.cpp \ + EC_Basic_Factory.cpp \ + EC_Basic_Filter_Builder.cpp \ + EC_Busy_Lock.cpp \ + EC_Command.cpp \ + EC_Conjunction_Filter.cpp \ + EC_ConsumerAdmin.cpp \ + EC_Disjunction_Filter.cpp \ + EC_Dispatching.cpp \ + EC_Reactive_Dispatching.cpp \ + EC_Event_Channel.cpp \ + EC_Event_Channel_Base.cpp \ + EC_Factory.cpp \ + EC_Filter.cpp \ + EC_Filter_Builder.cpp \ + EC_Gateway.cpp \ + EC_Gateway_UDP.cpp \ + EC_UDP_Out_Endpoint.cpp \ + ECG_Mcast_EH.cpp \ + EC_Null_Factory.cpp \ + EC_ObserverStrategy.cpp \ + EC_Per_Supplier_Filter.cpp \ + EC_ProxyConsumer.cpp \ + EC_Default_ProxyConsumer.cpp \ + EC_ProxyPushSupplier_Set.cpp \ + EC_ProxyPushSupplier_Set_T.cpp \ + EC_ProxySupplier.cpp \ + EC_Default_ProxySupplier.cpp \ + EC_QOS_Info.cpp \ + EC_Reactive_Timeout_Generator.cpp \ + EC_SupplierAdmin.cpp \ + EC_SupplierFiltering.cpp \ + EC_Timeout_Filter.cpp \ + EC_Timeout_Generator.cpp \ + EC_Type_Filter.cpp \ + EC_UDP_Admin.cpp \ + Event_Channel.cpp \ + Event_Manip.cpp \ + GPlot_File.cpp \ + Local_ESTypes.cpp \ + Memory_Pools.cpp \ + Module_Factory.cpp \ + RT_Task.cpp \ + ReactorTask.cpp \ + Timer_Module.cpp + +noinst_HEADERS = \ + BCU.h \ + Debug_Macros.h \ + Dispatching_Modules.h \ + Dispatching_Modules.i \ + EC_Basic_Factory.h \ + EC_Basic_Factory.i \ + EC_Basic_Filter_Builder.h \ + EC_Basic_Filter_Builder.i \ + EC_Busy_Lock.h \ + EC_Busy_Lock.i \ + EC_Command.h \ + EC_Command.i \ + EC_Conjunction_Filter.h \ + EC_Conjunction_Filter.i \ + EC_ConsumerAdmin.h \ + EC_ConsumerAdmin.i \ + EC_Disjunction_Filter.h \ + EC_Disjunction_Filter.i \ + EC_Dispatching.h \ + EC_Dispatching.i \ + EC_Event_Channel.h \ + EC_Event_Channel_Base.h \ + EC_Event_Channel.i \ + EC_Event_Channel_Base.i \ + EC_Factory.h \ + EC_Factory.i \ + EC_Filter.h \ + EC_Filter.i \ + EC_Filter_Builder.h \ + EC_Filter_Builder.i \ + EC_Gateway.h \ + EC_Gateway_UDP.h \ + EC_Gateway_UDP.i \ + EC_UDP_Out_Endpoint.h \ + EC_UDP_Out_Endpoint.i \ + EC_Null_Factory.h \ + EC_Null_Factory.i \ + EC_ObserverStrategy.h \ + EC_ObserverStrategy.i \ + EC_Per_Supplier_Filter.h \ + EC_Per_Supplier_Filter.i \ + EC_ProxyConsumer.h \ + EC_ProxyConsumer.i \ + EC_Default_ProxyConsumer.h \ + EC_Default_ProxyConsumer.i \ + EC_ProxyPushSupplier_Set.h \ + EC_ProxyPushSupplier_Set.i \ + EC_ProxyPushSupplier_Set_T.h \ + EC_ProxyPushSupplier_Set_T.i \ + EC_ProxySupplier.h \ + EC_ProxySupplier.i \ + EC_Default_ProxySupplier.h \ + EC_Default_ProxySupplier.i \ + EC_QOS_Info.h \ + EC_QOS_Info.i \ + EC_Reactive_Timeout_Generator.h \ + EC_Reactive_Timeout_Generator.i \ + EC_SupplierAdmin.h \ + EC_SupplierAdmin.i \ + EC_SupplierFiltering.h \ + EC_SupplierFiltering.i \ + EC_Timeout_Filter.h \ + EC_Timeout_Filter.i \ + EC_Timeout_Generator.h \ + EC_Timeout_Generator.i \ + EC_Type_Filter.h \ + EC_Type_Filter.i \ + EC_UDP_Admin.h \ + Event_Channel.h \ + Event_Channel.i \ + Fast_Reactor.h \ + GPlot_File.h \ + GPlot_File.i \ + Local_ESTypes.h \ + Local_ESTypes.i \ + Memory_Pools.h \ + Memory_Pools.i \ + Module_Factory.h \ + RT_Task.h \ + RT_Task.i \ + ReactorTask.h \ + Timer_Module.h \ + Timer_Module.i + +EXTRA_DIST = README + +## Clean up some additional files/directories possibly created during +## the configure script tests. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations + diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp index 282d4786003..b35af5eb52f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Event/Dispatching_Modules.h" -#include "orbsvcs/Event/Timer_Module.h" -#include "orbsvcs/Event/Event_Channel.h" -#include "orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/orbsvcs/Event/Dispatching_Modules.h" +#include "orbsvcs/orbsvcs/Event/Timer_Module.h" +#include "orbsvcs/orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/Module_Factory.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp index 951a933d70f..cc9677c430c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Sched_Params.h" -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" #include "RT_Task.h" #include "Debug_Macros.h" #include "Event_Channel.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h index 6bb34db4910..9cbf1d10a7e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "old_event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp index 92451aa9c6e..ca449ff4800 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp @@ -2,7 +2,7 @@ #include "ace/High_Res_Timer.h" #include "tao/Timeprobe.h" -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" #include "ReactorTask.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp index 6416bfa411e..de8d73e8625 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp @@ -2,7 +2,7 @@ #include "ace/Functor.h" -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" #include "ReactorTask.h" #include "Timer_Module.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h index 2b93e920c66..e28f0cc74ea 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h +++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h @@ -13,8 +13,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event/RT_Task.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event/RT_Task.h" class ACE_Command_Base; diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h index 075adda129a..2c97ce537d8 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h +++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" /// This is the number of events a consumer can subscribe to. const int ACE_ES_MAX_SUBSCRIPTIONS = 32; diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp index 3d45c411eaf..29b41b32d45 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/Event_Utilities.i" +#include "orbsvcs/orbsvcs/Event_Utilities.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (orbsvcs, diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h index 9bc493d5ea3..30d432cbdf9 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h @@ -16,8 +16,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "Event/event_export.h" @@ -244,7 +244,7 @@ private: #if defined (__ACE_INLINE__) -#include "orbsvcs/Event_Utilities.i" +#include "orbsvcs/orbsvcs/Event_Utilities.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc index 895e3355141..67ffb9aa245 100644 --- a/TAO/orbsvcs/orbsvcs/FTORB.mpc +++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc @@ -12,7 +12,7 @@ project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, minimum_corba } IDL_Files { - idlflags += -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h + idlflags += -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=FaultTolerance/FT_ORB_Utils_export.h FT_CORBA_ORB.idl } @@ -24,9 +24,6 @@ project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, minimum_corba FaultTolerance/FT_IOGR_Property.cpp } } - - Template_Files { - } } project(FT_ClientORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup { @@ -52,9 +49,6 @@ project(FT_ClientORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup { FaultTolerance/FT_Service_Callbacks.cpp } } - - Template_Files { - } } project(FT_ServerORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup { @@ -76,7 +70,4 @@ project(FT_ServerORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup { FaultTolerance/FT_ServerService_Activate.cpp } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl b/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl index 3290d1f2225..fd253ce9fec 100644 --- a/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl +++ b/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl @@ -13,9 +13,9 @@ #ifndef TAO_FTRT_GROUPMANAGER_IDL #define TAO_FTRT_GROUPMANAGER_IDL -#include "orbsvcs/RtecEventChannelAdmin.idl" +#include "orbsvcs/orbsvcs/RtecEventChannelAdmin.idl" #include "orb.idl" -#include "orbsvcs/CosNaming.idl" +#include "orbsvcs/orbsvcs/CosNaming.idl" #include "FTRT.idl" module FTRT diff --git a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl index e9529e48959..64c0009937c 100644 --- a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl +++ b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl @@ -11,18 +11,18 @@ // FT_Replica.idl // The next include is TAO specific. -#include "orbsvcs/FT_CORBA_ORB.idl" +#include "orbsvcs/orbsvcs/FT_CORBA_ORB.idl" #define FT_USES_PORTABLE_GROUP #ifdef FT_USES_PORTABLE_GROUP # include "orbsvcs/orbsvcs/PortableGroup.idl" #else // FT_USES_PORTABLE_GROUP -#include "orbsvcs/CosNaming.idl" // 98-10-19.idl +#include "orbsvcs/orbsvcs/CosNaming.idl" // 98-10-19.idl #endif // FT_USES_PORTABLE_GROUP -#include "orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl -#include "orbsvcs/CosNotifyFilter.idl" +#include "orbsvcs/orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl +#include "orbsvcs/orbsvcs/CosNotifyFilter.idl" #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl b/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl index b783eb46ace..194b6183e5f 100644 --- a/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl +++ b/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl @@ -22,9 +22,9 @@ #pragma prefix "omg.org" -#include "orbsvcs/FT_CORBA.idl" -#include "orbsvcs/FT_Replica.idl" -#include "orbsvcs/PortableGroup.idl" +#include "orbsvcs/orbsvcs/FT_CORBA.idl" +#include "orbsvcs/orbsvcs/FT_Replica.idl" +#include "orbsvcs/orbsvcs/PortableGroup.idl" module FT { diff --git a/TAO/orbsvcs/orbsvcs/FT_Notifier.idl b/TAO/orbsvcs/orbsvcs/FT_Notifier.idl index bb1d839f388..de0e071b58a 100644 --- a/TAO/orbsvcs/orbsvcs/FT_Notifier.idl +++ b/TAO/orbsvcs/orbsvcs/FT_Notifier.idl @@ -17,16 +17,16 @@ /////////////////////////////// // TAO specific includes -#include "orbsvcs/FT_CORBA_ORB.idl" -#include "orbsvcs/FT_Replica.idl" +#include "orbsvcs/orbsvcs/FT_CORBA_ORB.idl" +#include "orbsvcs/orbsvcs/FT_Replica.idl" // end of TAO specific includes /////////////////////////////// -#include "orbsvcs/CosNaming.idl" // 98-10-19.idl -#include "orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl +#include "orbsvcs/orbsvcs/CosNaming.idl" // 98-10-19.idl +#include "orbsvcs/orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl // added to OMG version: -#include "orbsvcs/CosNotifyFilter.idl" +#include "orbsvcs/orbsvcs/CosNotifyFilter.idl" #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl b/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl index 8f36d6b135a..73d47a48b52 100644 --- a/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl +++ b/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl @@ -15,10 +15,10 @@ #ifndef _FT_REPLICATION_MANAGER_IDL_ #define _FT_REPLICATION_MANAGER_IDL_ -#include "orbsvcs/PortableGroup.idl" -#include "orbsvcs/FT_CORBA.idl" -#include "orbsvcs/FT_Replica.idl" -#include "orbsvcs/FT_Notifier.idl" +#include "orbsvcs/orbsvcs/PortableGroup.idl" +#include "orbsvcs/orbsvcs/FT_CORBA.idl" +#include "orbsvcs/orbsvcs/FT_Replica.idl" +#include "orbsvcs/orbsvcs/FT_Notifier.idl" #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc index 48d2ca9189c..1b34fde8571 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc @@ -1,11 +1,12 @@ // -*- MPC -*- // $Id$ -project(FaultTolerance): orbsvcslib, core, notification, ftorb, portablegroup, minimum_corba { +project(FaultTolerance): orbsvcslib, core, notification, ftorb, portablegroup { sharedname = TAO_FaultTolerance - idlflags += -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h + idlflags += -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h dynamicflags = TAO_FT_BUILD_DLL tagchecks += FaultTolerance + avoids += minimum_corba IDL_Files { FT_CORBA.idl @@ -30,7 +31,4 @@ project(FaultTolerance): orbsvcslib, core, notification, ftorb, portablegroup, m FT_ReplicationManagerC.cpp } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/ChangeLog b/TAO/orbsvcs/orbsvcs/FaultTolerance/ChangeLog index b96cc14f6bc..aea5194b472 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/ChangeLog +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/ChangeLog @@ -1,10 +1,3 @@ -Fri Sep 3 13:57:11 2004 Ossama Othman <ossama@dre.vanderbilt.edu> - - * FT_Endpoint_Selector_Factory.cpp: - - Include "tao/SystemException.h" instead of "tao/Exception.h" to - pull CORBA::SystemException class declaration. - Thu Aug 28 07:37:49 2003 Ossama Othman <ossama@dre.vanderbilt.edu> * FT_Invocation_Endpoint_Selectors.cpp: @@ -14,8 +7,8 @@ Thu Aug 28 07:37:49 2003 Ossama Othman <ossama@dre.vanderbilt.edu> Thu Jul 10 11:20:52 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * orbsvcs/orbsvcs/Makefile.FaulTolerance: Added new files. - - * orbsvcs/orbsvcs/FT_CORBA_ORB.idl: Make the IDL spec compatible. + + * orbsvcs/orbsvcs/FT_CORBA_ORB.idl: Make the IDL spec compatible. Thu Jul 10 11:09:25 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> @@ -29,14 +22,14 @@ Thu Jul 10 11:09:25 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp: * orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h: Register the server side and client side interceptors through the - initializer. + initializer. * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp: * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h: The latest specs changed the attribute in FTRequestDurationPolicy from request_duration_policy to request_duration_policy_value. Changed the accesor to match the - IDL file. + IDL file. * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp: * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h: Removed @@ -55,3 +48,5 @@ Thu Jul 10 11:09:25 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/PortableServer/ServantBase.cpp: The effect of the above change. + + diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp index c59cd08d228..a02b8ba4a14 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp @@ -5,7 +5,7 @@ #include "FT_ClientORBInitializer.h" #include "FT_ClientPolicyFactory.h" #include "FT_ClientRequest_Interceptor.h" -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" #include "tao/Exception.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp index 7da3391fdd8..1f86d5f03dc 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp @@ -4,7 +4,7 @@ #include "FT_ClientPolicyFactory.h" #include "FT_ClientPolicy_i.h" -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h index f9e93824f1c..48a3e1bdea8 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h @@ -14,7 +14,7 @@ #define TAO_FT_CLIENTPOLICY_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index 719ae0c489d..e61ed2037e8 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -1,7 +1,7 @@ // $Id$ #include "FT_ClientRequest_Interceptor.h" -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" #include "tao/CORBA_String.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp index bd37bc897c2..12aa20f5d9f 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp @@ -2,14 +2,10 @@ #include "FT_Endpoint_Selector_Factory.h" #include "FT_Invocation_Endpoint_Selectors.h" -#include "tao/SystemException.h" +#include "tao/Exception.h" #include "tao/Environment.h" - -ACE_RCSID (FaultTolerance, - FT_Endpoint_Selector_Factory, - "$Id$") - +ACE_RCSID(FaultTolerance, FT_Endpoint_Selector_Factory, "$Id$") TAO_FT_Endpoint_Selector_Factory::TAO_FT_Endpoint_Selector_Factory (void) :ft_endpoint_selector_ (0) @@ -40,7 +36,6 @@ TAO_FT_Endpoint_Selector_Factory::get_selector ( ACE_NEW_THROW_EX (ft_endpoint_selector_, TAO_FT_Invocation_Endpoint_Selector (), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); } } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h index 94d4b522b89..a80b43b1978 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h @@ -24,7 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/IORManipulation/IORManip_Loader.h" -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" #include "tao/IOPC.h" #include "FT_ORB_Utils_export.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp index 728f608a449..fd8e7e29908 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp @@ -6,7 +6,7 @@ #include "FT_ServerPolicyFactory.h" #include "FT_ServerRequest_Interceptor.h" #include "tao/ORB_Constants.h" -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" #include "tao/Exception.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp index e06536ee5f6..126a9b4d1b0 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp @@ -4,7 +4,7 @@ #include "FT_ServerPolicyFactory.h" #include "FT_ServerPolicy_i.h" -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h index c2fcc4cab2a..5441291f6fc 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h @@ -14,7 +14,7 @@ #define TAO_FT_SERVERPOLICY_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index 07785dbf0f1..95703574f92 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -6,7 +6,7 @@ #include "tao/DynamicC.h" #include "tao/Typecode.h" #include "tao/CDR.h" -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h index b4f496ea24f..8d6d3873e53 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h @@ -21,7 +21,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Service_Callbacks.h" -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" class TAO_Profile; class TAO_MProfile; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc index 4b2c6020f5c..693d2fb5c50 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc @@ -1,10 +1,11 @@ // -*- MPC -*- // $Id$ -project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming, minimum_corba { +project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming { sharedname = TAO_FtRtEvent + avoids += minimum_corba - idlflags += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h + idlflags += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h dynamicflags = TAO_FTRTEVENT_BUILD_DLL tagchecks = FtRtEvent @@ -32,9 +33,6 @@ project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming, minimum_cor FtRtEvent/Utils } } - - Template_Files { - } } project (FTRT_ClientORB) : messaging, orbsvcslib, core { @@ -51,20 +49,15 @@ project (FTRT_ClientORB) : messaging, orbsvcslib, core { FtRtEvent/ClientORB } } - - Inline_Files { - } - - Template_Files { - } } -project (FTRT_EventChannel) : orbsvcslib, core, ftrtevent, utils, corba_messaging { +project (FTRT_EventChannel) : orbsvcslib, ftrtevent, utils { sharedname = TAO_FTRT_EventChannel dynamicflags = TAO_FTRTEC_BUILD_DLL tagchecks = FTRT_EventChannel includes += $(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/EventChannel after += FTORB_Utils + requires += corba_messaging IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h index 07caec84c43..d385490ef76 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h @@ -15,7 +15,7 @@ #include "UpdateableHandler.h" #include "Replication_Strategy.h" -#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" #include "ace/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h index 5cb5792d3c1..055b3ea22cc 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h @@ -15,7 +15,7 @@ #include "ace/Task.h" #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/FTRT_GroupManagerC.h" +#include "orbsvcs/orbsvcs/FTRT_GroupManagerC.h" #include "Replication_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp index fa2c3cf0dbd..bc27837b85d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" #include "FTEC_ConsumerAdmin.h" #include "FTEC_ProxySupplier.h" #include "ProxySupplierStateWorker.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h index 267162a8b4b..78cd609596a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h @@ -17,7 +17,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" #include "FT_ProxyAdmin_T.h" #include "ProxySupplierStateWorker.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h index ff7d20f47ff..961289f2e6e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h @@ -13,7 +13,7 @@ #define FTEC_EVENT_CHANNEL_H #include "ftrtec_export.h" -#include "orbsvcs/FtRtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index 5c9c7f79053..d452581b1bd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -11,7 +11,7 @@ #include "IOGR_Maker.h" #include "Replication_Service.h" #include "../Utils/Safe_InputCDR.h" -#include "orbsvcs/FtRtecEventCommC.h" +#include "orbsvcs/orbsvcs/FtRtecEventCommC.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h index 4ddb93d6450..2f021715f21 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h @@ -13,8 +13,8 @@ #define TAO_FTEC_EVENT_CHANNEL_H #include "ace/Synch_T.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" #include "FTEC_Factory.h" #include "FTEC_Group_Manager.h" #include "IOGR_Maker.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp index b46188a9458..f49851fc591 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp @@ -1,5 +1,5 @@ // $Id$ -#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "FTEC_Event_Channel.h" #include "FTEC_Factory.h" #include "FTEC_ProxySupplier.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h index d253716dba1..f66743e06b8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h @@ -12,7 +12,7 @@ #ifndef FTEC_FACTORY_H #define FTEC_FACTORY_H -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h index f2720fa1393..e41fc061fe2 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h @@ -13,7 +13,7 @@ #ifndef TAO_FTEC_GROUP_MANAGER_H #define TAO_FTEC_GROUP_MANAGER_H -#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" #include "FTEC_Fault_Listener.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h index 0522671688a..71555d8e463 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h @@ -12,9 +12,9 @@ #ifndef TAO_FTEC_PROXYCONSUMER_H #define TAO_FTEC_PROXYCONSUMER_H -#include "orbsvcs/Event/EC_Default_ProxyConsumer.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h" #include "ace/SString.h" -#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" #include "Request_Context_Repository.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h index a1ca15aeaff..00214efb221 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h @@ -12,9 +12,9 @@ #ifndef TAO_FTEC_PROXYSUPPLIER_H #define TAO_FTEC_PROXYSUPPLIER_H -#include "orbsvcs/Event/EC_Default_ProxySupplier.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h" #include "ace/SString.h" -#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" #include "Request_Context_Repository.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp index b67a0fe6a3a..c78245ef4d0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" #include "FTEC_SupplierAdmin.h" #include "FTEC_ProxyConsumer.h" #include "tao/Stub.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h index 9bbdca262ed..86cabee49b7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h" class TAO_FTEC_Event_Channel_Impl; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h index 01d02f86e00..a3b2cb066fd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" #include "tao/corba.h" #include "tao/PortableServer/Servant_Base.h" -#include "orbsvcs/FtRtecEventCommC.h" +#include "orbsvcs/orbsvcs/FtRtecEventCommC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h index 10d93e3705d..bdee43cd7a7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h @@ -16,7 +16,7 @@ #include "ace/Task.h" #include "ace/Reactor.h" -#include "orbsvcs/FTRT_GroupManagerC.h" +#include "orbsvcs/orbsvcs/FTRT_GroupManagerC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index f228a360c5f..b0fcba2ef7c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -11,7 +11,7 @@ #include "tao/Object_KeyC.h" #include "tao/ORB_Constants.h" -#include "orbsvcs/FTRTC.h" +#include "orbsvcs/orbsvcs/FTRTC.h" ACE_RCSID (EventChannel, ForwardCtrlServerInterceptor, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index ce5ea538e26..3b3a0efc522 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" #include "FtEventServiceInterceptor.h" #include "Request_Context_Repository.h" #include "../Utils/Safe_InputCDR.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h index 4607ee70075..2c58dcad192 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h @@ -16,7 +16,7 @@ #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" #include "tao/ORB.h" -#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h index 574a89bf1c8..f7eddb4ff98 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h @@ -13,7 +13,7 @@ #ifndef GROUPINFOPUBLISHER_H #define GROUPINFOPUBLISHER_H -#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" #include "tao/PortableServer/PortableServerC.h" #include "ace/Vector_T.h" #include "ace/Singleton.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index 03ff6faf180..2b474626ac6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -10,7 +10,7 @@ #include <algorithm> #include "../Utils/resolve_init.h" #include "../Utils/Safe_InputCDR.h" -#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "GroupInfoPublisher.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h index 99619a369d3..a34c696e523 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h @@ -13,7 +13,7 @@ #ifndef IOGR_MAKER_H #define IOGR_MAKER_H -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" #include "tao/IORManipulation/IORManipulation.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h index 0fb06766859..d5c4578016e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h @@ -14,9 +14,9 @@ #define IDENTIFICATION_SERVICE_H #include "ace/Service_Object.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/FTRTC.h" -#include "orbsvcs/FtRtecEventCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/FTRTC.h" +#include "orbsvcs/orbsvcs/FtRtecEventCommC.h" #include "ftrtec_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h index 8b5b14f8acd..fce0d28a993 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h @@ -12,7 +12,7 @@ #ifndef OBJECTGROUPMANAGERHANDLER_H #define OBJECTGROUPMANAGERHANDLER_H -#include "orbsvcs/FTRT_GroupManagerS.h" +#include "orbsvcs/orbsvcs/FTRT_GroupManagerS.h" #include "ace/Auto_Event.h" class ObjectGroupManagerHandler : public POA_FTRT::AMI_ObjectGroupManagerHandler diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp index 7869ab38378..a9c60538ae2 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp @@ -1,8 +1,8 @@ // $Id$ #include "ProxyConsumerStateWorker.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" ACE_RCSID (EventChannel, ProxyConsumerStateWorker, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h index 772fd16538e..1de276bb2c6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h @@ -13,8 +13,8 @@ #ifndef PROXYCONSUMERSTATEWORKER_H #define PROXYCONSUMERSTATEWORKER_H -#include "orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "FTEC_ProxyConsumer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp index cb455699293..0a0e2d732a0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" #include "ProxySupplierStateWorker.h" -#include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h" ACE_RCSID (EventChannel, ProxySupplierStateWorker, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h index aa6681719de..01158edeb08 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h @@ -13,8 +13,8 @@ #ifndef PROXYSUPPLIERSTATEWORKER_H #define PROXYSUPPLIERSTATEWORKER_H -#include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "FTEC_ProxySupplier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h index 24615e80cc4..cc204aca9a3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h @@ -13,7 +13,7 @@ #ifndef REPLCATION_SERVICE_H #define REPLCATION_SERVICE_H -#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" #include "FTEC_Become_Primary_Listener.h" #include "tao/PortableInterceptorC.h" #include "ace/Service_Object.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h index 7ed955e2d11..40a4eee3bc5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h @@ -12,7 +12,7 @@ #ifndef REPLICATION_STRATEGY_H #define REPLICATION_STRATEGY_H -#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" #include "tao/PortableInterceptorC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h index 158b43ea297..f8aa835afa9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h @@ -13,7 +13,7 @@ #ifndef REQUEST_CONTEXT_REPOSITORY_H #define REQUEST_CONTEXT_REPOSITORY_H -#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" #include "tao/PortableInterceptorC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp index 1a890399027..0fd88f14e61 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -2,7 +2,7 @@ #include "tao/CDR.h" #include "Set_Update_Interceptor.h" -#include "orbsvcs/FTRTC.h" +#include "orbsvcs/orbsvcs/FTRTC.h" #include "Request_Context_Repository.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h index a1ba493264f..07f61e9e461 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h @@ -12,7 +12,7 @@ #ifndef UPDATEABLEHANDLER_H #define UPDATEABLEHANDLER_H -#include "orbsvcs/FTRTS.h" +#include "orbsvcs/orbsvcs/FTRTS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index f68d1cdcde8..38c23229766 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -2,7 +2,7 @@ #include "activate_with_id.h" #include "UUID.h" #include "resolve_init.h" -#include "orbsvcs/FtRtecEventCommS.h" +#include "orbsvcs/orbsvcs/FtRtecEventCommS.h" #include "tao/ORB_Core.h" ACE_RCSID (Utils, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h index 9cafa79f8f8..bc4a9139dfc 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h @@ -13,8 +13,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" namespace TAO_FTRTEC { diff --git a/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl index 866640ef114..234f59d2480 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl +++ b/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl @@ -13,7 +13,7 @@ #ifndef TAO_FTRTEC_EVENTCHANNELADMIN_IDL #define TAO_FTRTEC_EVENTCHANNELADMIN_IDL -#include "orbsvcs/RtecEventChannelAdmin.idl" +#include "orbsvcs/orbsvcs/RtecEventChannelAdmin.idl" #include "FTRT.idl" #include "FTRT_GroupManager.idl" #include "FtRtecEventComm.idl" diff --git a/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl b/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl index a1406158952..6d44c9ba90b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl +++ b/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl @@ -13,7 +13,7 @@ #ifndef FTRTECEVNETCOMM_H #define FTRTECEVNETCOMM_H -#include "orbsvcs/RtecEventComm.idl" +#include "orbsvcs/orbsvcs/RtecEventComm.idl" module FtRtecEventComm { diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc index 2cd7439e464..dbc1d9dd9e5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService.mpc +++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc @@ -14,7 +14,4 @@ project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, mi IFRService } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp index b98aa19dc88..be0914d8d92 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp @@ -143,8 +143,7 @@ TAO_Contained_i::id_i (const char *id == 0) { // Repository id already exists. - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, - CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::BAD_PARAM (2, CORBA::COMPLETED_NO)); } // Get the old id. @@ -249,8 +248,7 @@ TAO_Contained_i::name_i (const char *name if (exists) { - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3, - CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::BAD_PARAM (3, CORBA::COMPLETED_NO)); } // Reset the local name. @@ -534,7 +532,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container, { if (my_repo.in () != new_container) { - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4, + ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO)); } @@ -560,8 +558,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container, if (my_repo.in () != your_repo.in ()) { - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4, - CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO)); } this->repo_->config ()->expand_path (this->repo_->root_key (), @@ -872,8 +869,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container, } else { - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4, - CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO)); } } case CORBA::dk_Operation: @@ -937,8 +933,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container, } else { - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4, - CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO)); } } case CORBA::dk_Value: diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp index ff57fd226d8..03e213e0989 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp @@ -2590,7 +2590,7 @@ TAO_Container_i::create_value_common ( } else { - ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 12, + ACE_THROW_RETURN (CORBA::BAD_PARAM (12, CORBA::COMPLETED_NO), path); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp index 547f64f983b..4a3b9f3067d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp @@ -332,7 +332,7 @@ TAO_ExtValueDef_i::describe_ext_value_i ( if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31, + ACE_THROW_RETURN (CORBA::BAD_PARAM (31, CORBA::COMPLETED_NO), 0); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index e5dffde6134..f4aa04e4953 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -4,10 +4,10 @@ #include "IDLType_i.h" #include "Container_i.h" #include "Contained_i.h" -#include "orbsvcs/IFRService/ComponentRepository_i.h" -#include "orbsvcs/IFRService/Options.h" -#include "orbsvcs/IFRService/IFR_ComponentsS.h" -#include "orbsvcs/IOR_Multicast.h" +#include "orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h" +#include "orbsvcs/orbsvcs/IFRService/Options.h" +#include "orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h" +#include "orbsvcs/orbsvcs/IOR_Multicast.h" #include "tao/IORTable/IORTable.h" #include "tao/ORB_Core.h" #include "tao/default_ports.h" @@ -576,7 +576,7 @@ TAO_IFR_Service_Utils::valid_container ( if (error_flag == 1) { - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4, + ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO)); } } @@ -616,7 +616,7 @@ TAO_IFR_Service_Utils::id_exists (const char *id, holder) == 0) { - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, + ACE_THROW (CORBA::BAD_PARAM (2, CORBA::COMPLETED_NO)); } } @@ -663,7 +663,7 @@ TAO_IFR_Service_Utils::name_exists ( if ((*checker) (member_name.fast_rep ()) != 0) { - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3, + ACE_THROW (CORBA::BAD_PARAM (3, CORBA::COMPLETED_NO)); } } @@ -808,7 +808,7 @@ TAO_IFR_Service_Utils::check_subsection ( if ((*checker) (entry_name.fast_rep ()) != 0) { - ACE_THROW (CORBA::BAD_PARAM (3, + ACE_THROW (CORBA::BAD_PARAM (5, CORBA::COMPLETED_NO)); return; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp index 7e313b4f5e8..6b16fabefcf 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp @@ -281,7 +281,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf if (def_kind != CORBA::dk_AbstractInterface) { - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 11, + ACE_THROW (CORBA::BAD_PARAM (11, CORBA::COMPLETED_NO)); } } @@ -763,7 +763,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, // Oneway operations cannot have a non-void return type. if (mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31, + ACE_THROW_RETURN (CORBA::BAD_PARAM (31, CORBA::COMPLETED_NO), CORBA::OperationDef::_nil ()); } @@ -838,7 +838,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, // Oneway operations cannot throw any user exceptions. if (mode == CORBA::OP_ONEWAY) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31, + ACE_THROW_RETURN (CORBA::BAD_PARAM (31, CORBA::COMPLETED_NO), CORBA::OperationDef::_nil ()); } @@ -1250,7 +1250,7 @@ TAO_InterfaceDef_i::check_inherited (const char *name, if (inherited_name == name) { - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 5, + ACE_THROW (CORBA::BAD_PARAM (5, CORBA::COMPLETED_NO)); } } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp index 542d0f31a68..f97acafd52f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp @@ -38,8 +38,7 @@ void TAO_PrimitiveDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, - CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO)); } CORBA::TypeCode_ptr diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index c57bd56ef5e..f46dc8889ab 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -49,8 +49,7 @@ void TAO_Repository_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, - CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO)); } CORBA::Contained_ptr diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp index 719a56c6e52..c5cf819239f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp @@ -270,7 +270,7 @@ TAO_ValueDef_i::supported_interfaces_i ( } else { - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 12, + ACE_THROW (CORBA::BAD_PARAM (12, CORBA::COMPLETED_NO)); return; } @@ -1027,7 +1027,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL) if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31, + ACE_THROW_RETURN (CORBA::BAD_PARAM (31, CORBA::COMPLETED_NO), 0); } @@ -1647,7 +1647,7 @@ TAO_ValueDef_i::create_operation_i ( // Oneway operations cannot have a non-void return type. if (mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31, + ACE_THROW_RETURN (CORBA::BAD_PARAM (31, CORBA::COMPLETED_NO), CORBA::OperationDef::_nil ()); } @@ -1684,7 +1684,7 @@ TAO_ValueDef_i::create_operation_i ( // Oneway operations cannot have INOUT or OUT parameters. if (mode == CORBA::OP_ONEWAY && params[i].mode != CORBA::PARAM_IN) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31, + ACE_THROW_RETURN (CORBA::BAD_PARAM (31, CORBA::COMPLETED_NO), CORBA::OperationDef::_nil ()); } @@ -1722,7 +1722,7 @@ TAO_ValueDef_i::create_operation_i ( // Oneway operations cannot throw any user exceptions. if (mode == CORBA::OP_ONEWAY) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31, + ACE_THROW_RETURN (CORBA::BAD_PARAM (31, CORBA::COMPLETED_NO), CORBA::OperationDef::_nil ()); } diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp index 9d4e1856309..36f93806e53 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp @@ -41,10 +41,7 @@ TAO_IOR_Multicast::TAO_IOR_Multicast (const char *ior, TAO_IOR_Multicast::~TAO_IOR_Multicast (void) { - if (this->mcast_dgram_.leave (this->mcast_addr_) == -1) - { - ACE_ERROR ((LM_ERROR, "%p\n", "leave")); - } + this->mcast_dgram_.leave (this->mcast_addr_); } int diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h index 863106d7487..9d26c3665cb 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h @@ -23,7 +23,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/svc_utils_export.h" +#include "orbsvcs/orbsvcs/svc_utils_export.h" #include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index 3032e0d46e6..a7c6b501515 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -4,11 +4,10 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" -#include "ace/os_include/sys/os_pstat.h" -#include "ace/os_include/sys/os_loadavg.h" -#if defined(__NetBSD__) -#include <sys/sysctl.h> -#endif + +#if defined (ACE_HAS_SYS_LOADAVG_H) +# include <sys/loadavg.h> +#endif /* ACE_HAS_SYS_LOADAVG_H */ ACE_RCSID (LoadBalancing, LB_CPU_Load_Average_Monitor, @@ -162,33 +161,6 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) else ACE_THROW_RETURN (CORBA::TRANSIENT (), 0); // Correct exception? -#elif defined (__NetBSD__) - - double loadavg[1]; - - const int samples = ::getloadavg (loadavg, 1); - - if (samples == 1) - { - int mib[2], num_processors; - size_t len; - - mib[0] = CTL_HW; - mib[1] = HW_NCPU; - len = sizeof(num_processors); - - sysctl(mib, 2, &num_processors, &len, NULL, 0); - - ACE_ASSERT (num_processors > 0); - - if (num_processors > 0) - load = loadavg[0] / num_processors; - else - ACE_THROW_RETURN (CORBA::TRANSIENT (), 0); // Correct exception? - } - else - ACE_THROW_RETURN (CORBA::TRANSIENT (), 0); // Correct exception? - #elif defined (hpux) struct pst_dynamic psd; @@ -209,7 +181,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) #endif -#if defined (WINDOWS) || defined (linux) || defined (sun) || defined (hpux) || defined(__NetBSD__) +#if defined (WINDOWS) || defined (linux) || defined (sun) || defined (hpux) CosLoadBalancing::LoadList * tmp; ACE_NEW_THROW_EX (tmp, @@ -235,6 +207,6 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) ACE_UNUSED_ARG (load); ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); -#endif /* WINDOWS || linux || sun || hpux || __NetBSD__ */ +#endif /* WINDOWS || linux || sun || hpux */ } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h index ce0e3b6e62c..d680e65932a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index ec895f1af36..e639d21a88b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -4,7 +4,10 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" -#include "ace/os_include/sys/os_loadavg.h" + +#if defined (ACE_HAS_SYS_LOADAVG_H) +# include <sys/loadavg.h> +#endif /* ACE_HAS_SYS_LOADAVG_H */ ACE_RCSID (LoadBalancing, LB_CPU_Utilization_Monitor, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h index 6ad66ee8ada..fab93d1af5f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h @@ -17,13 +17,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h index 4d960d74884..224294591bc 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/LB_ORTC.h" +#include "orbsvcs/orbsvcs/LB_ORTC.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp index fd3240d0bcd..374198c8aac 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp @@ -1,6 +1,6 @@ #include "LB_ClientRequestInterceptor.h" -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" ACE_RCSID (LoadBalancing, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h index 0f290d8412b..166d3037734 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/LB_ORTC.h" +#include "orbsvcs/orbsvcs/LB_ORTC.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h index 7252318027a..537a3dcbdaf 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #include "tao/LocalObject.h" #include "tao/IORInterceptor/IORInterceptorC.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 11c0c402b90..97b11bfb4df 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -2,7 +2,7 @@ #include "LB_LoadMap.h" #include "LB_Random.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index 478b6d22b63..0ae1886cd3b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -22,7 +22,7 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h index 5c356ef3b41..bec59e2725f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" class TAO_LoadBalancing_Export TAO_LB_LoadAlert diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp index 78eeeb187f6..8b4effbc06d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp @@ -1,5 +1,5 @@ #include "LB_LoadAlertInfo.h" -#include "orbsvcs/PortableGroup/PG_Operators.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h" ACE_RCSID (LoadBalancing, LB_LoadAlertInfo, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h index 6736448e92c..069c924c021 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h index 620ec2d3acb..de57de3dc2a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h @@ -24,8 +24,8 @@ #include "LB_LoadAlertInfo.h" -#include "orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h index 0768f411ac2..00ca3154c3d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h @@ -13,7 +13,7 @@ #ifndef TAO_LB_LOAD_ALERT_REPLY_HANDLER_H #define TAO_LB_LOAD_ALERT_REPLY_HANDLER_H -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index a9865acf8b7..d6da83152c8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -2,7 +2,7 @@ #include "LB_LoadMap.h" #include "LB_Random.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h index fc69de65e4a..8f50a617e19 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h @@ -23,7 +23,7 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h index ebfbb3b6cb7..1ca35de22bf 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h @@ -16,16 +16,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" -#include "orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index 32d63b54f0f..e70d2ef5c7c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -8,8 +8,8 @@ #include "LB_LeastLoaded.h" #include "LB_conf.h" -#include "orbsvcs/PortableGroup/PG_Property_Utils.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" #include "tao/Messaging/Messaging.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h index 06b190c4e4b..fc9477c0cb2 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -28,11 +28,11 @@ #include "LB_LoadListMap.h" #include "LB_Pull_Handler.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" -#include "orbsvcs/PortableGroup/PG_PropertyManager.h" -#include "orbsvcs/PortableGroup/PG_GenericFactory.h" -#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h" class TAO_LoadBalancing_Export TAO_LB_LoadManager diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h index 6e5778f4a55..1ff00d58bc6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h @@ -16,16 +16,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" -#include "orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 8f0cc83f219..a247293b071 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -3,7 +3,7 @@ #include "LB_LoadMap.h" #include "LB_Random.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h index 522d574ea3c..1587d889b3f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h @@ -23,7 +23,7 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h index b99c5437779..9bda59cc806 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "ace/Functor.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h index 02b8f12adeb..46dd23539e5 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h @@ -16,14 +16,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp index 245fc0552b1..9f59c099b0f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp @@ -2,7 +2,7 @@ #include "LB_IORInterceptor.h" #include "LB_ServerRequestInterceptor.h" -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h index d7bab7a8e98..6ca2b5b8597 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LB_ORTC.h" +#include "orbsvcs/orbsvcs/LB_ORTC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,7 +28,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #include "ace/Array_Base.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h index 2f03027c78a..7eb9eb88c72 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp index 6e8c1db4288..82e408654ff 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp @@ -2,7 +2,7 @@ #include "LB_RoundRobin.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h index c244a697157..934e92a7d1c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h @@ -22,9 +22,9 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/LoadBalancing/LB_Location_Index_Map.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h" -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" /** * @class TAO_LB_RoundRobin_Strategy diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h index a03a561f291..4a7d114122e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h @@ -18,7 +18,7 @@ #include "ace/config-all.h" -#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp index 2a96caf9700..9d6f39e6fb5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/Log/BasicLogFactory_i.h" +#include "orbsvcs/orbsvcs/Log/BasicLogFactory_i.h" ACE_RCSID (Log, BasicLogFactory_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h index 3b97e456f6e..bc0f66de571 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h @@ -19,14 +19,14 @@ #define TAO_TLS_BASICLOGFACTORY_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/Log/BasicLog_i.h" +#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/orbsvcs/Log/BasicLog_i.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -42,7 +42,7 @@ * * @brief The BasicLogFactory is a factory that is used to create event-unaware Logs. */ -class TAO_Log_Serv_Export TAO_BasicLogFactory_i : +class TAO_Log_Export TAO_BasicLogFactory_i : public POA_DsLogAdmin::BasicLogFactory, public TAO_LogMgr_i { diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index dfcb7dbc492..17499a8b671 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/Log/BasicLog_i.h" +#include "orbsvcs/orbsvcs/Log/BasicLog_i.h" -#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" ACE_RCSID (Log, BasicLog_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index 6b95fe6fcd2..b6f837e2de6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -21,14 +21,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Log/Log_i.h" -#include "log_serv_export.h" +#include "orbsvcs/orbsvcs/Log/Log_i.h" +#include "log_export.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -48,7 +48,7 @@ class TAO_LogMgr_i; * * The class supports the @c destroy> method to destroy the Log. */ -class TAO_Log_Serv_Export TAO_BasicLog_i : +class TAO_Log_Export TAO_BasicLog_i : public TAO_Log_i, public POA_DsLogAdmin::BasicLog, public virtual PortableServer::RefCountServantBase diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp index 04187810399..f00ce56edef 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/Log/EventLog_i.h" -#include "orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/orbsvcs/Log/EventLog_i.h" +#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/orbsvcs/Log/LogNotification.h" ACE_RCSID (Log, EventLogConsumer, diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h index fd1db823fcb..933bcc1c2e4 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h @@ -19,18 +19,18 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/DsEventLogAdminS.h" -#include "orbsvcs/Log/Log_i.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/DsEventLogAdminS.h" +#include "orbsvcs/orbsvcs/Log/Log_i.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "eventlog_serv_export.h" +#include "eventlog_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp index 800174ac1e9..08550f254e5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/Log/EventLogFactory_i.h" -#include "orbsvcs/Log/LogNotification.h" -#include "orbsvcs/Log/EventLogNotification.h" +#include "orbsvcs/orbsvcs/Log/EventLogFactory_i.h" +#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/orbsvcs/Log/EventLogNotification.h" #include "ace/Auto_Ptr.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h index ebc24764275..8c708aeefed 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h @@ -20,17 +20,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/DsEventLogAdminS.h" +#include "orbsvcs/orbsvcs/DsEventLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/DsLogAdminS.h" -#include "orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" #include "EventLog_i.h" #if defined(_MSC_VER) @@ -48,7 +48,7 @@ class TAO_EventLogNotification; * * @brief The EventLogFactory is a factory that is used to create EventLogs which are event-aware. */ -class TAO_EventLog_Serv_Export TAO_EventLogFactory_i : +class TAO_EventLog_Export TAO_EventLogFactory_i : public POA_DsEventLogAdmin::EventLogFactory, public TAO_LogMgr_i diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp index 7efe128c8b3..9dfb1fa5c5a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/Log/LogNotification.h" -#include "orbsvcs/Log/EventLogNotification.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/orbsvcs/Log/EventLogNotification.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/debug.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h index b31e7afea54..582b9eaa533 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h @@ -20,17 +20,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/DsEventLogAdminS.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" -#include "orbsvcs/CosEventCommS.h" -#include "eventlog_serv_export.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/DsEventLogAdminS.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -44,7 +43,7 @@ * * @brief Used to forward log generated events to a logging server. */ -class TAO_EventLog_Serv_Export TAO_EventLogNotification : +class TAO_EventLog_Export TAO_EventLogNotification : public TAO_LogNotification, public POA_CosEventComm::PushSupplier { diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index a76aeb0ada8..76e5f3afd74 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/Log/EventLog_i.h" -#include "orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/orbsvcs/Log/EventLog_i.h" +#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/orbsvcs/Log/LogNotification.h" ACE_RCSID (Log, EventLog_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h index c4c3faacc3a..f4fb4b15618 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h @@ -20,19 +20,19 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/DsEventLogAdminS.h" -#include "orbsvcs/Log/Log_i.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/Log/EventLogConsumer.h" +#include "orbsvcs/orbsvcs/DsEventLogAdminS.h" +#include "orbsvcs/orbsvcs/Log/Log_i.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/Log/EventLogConsumer.h" -#include "eventlog_serv_export.h" +#include "eventlog_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp index fcbf59d24e0..ac4780e1dcc 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -1,8 +1,8 @@ #include "Iterator_i.h" -#include "orbsvcs/Log/Log_Constraint_Interpreter.h" -#include "orbsvcs/Log/Log_Constraint_Visitors.h" -#include "orbsvcs/DsLogAdminC.h" +#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h" +#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h" +#include "orbsvcs/orbsvcs/DsLogAdminC.h" ACE_RCSID (Log, Iterator_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h index 4c3c004f333..e192849618c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h @@ -19,13 +19,13 @@ #define TAO_TLS_ITERATOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Log/LogRecordStore.h" +#include "orbsvcs/orbsvcs/Log/LogRecordStore.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -41,7 +41,7 @@ * * @brief Iterator to get LogRecords for the log via a query. */ -class TAO_Log_Serv_Export TAO_Iterator_i : +class TAO_Log_Export TAO_Iterator_i : public POA_DsLogAdmin::Iterator, public virtual PortableServer::RefCountServantBase { diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index b5618c41cb2..9c3eb6dd47a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -5,7 +5,6 @@ ACE_RCSID (Log, "$Id$") TAO_LogMgr_i::TAO_LogMgr_i (void) - : max_id_ (0) { // No-Op. } diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h index ce07c14d6c8..111c961ecb6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -18,15 +18,15 @@ #define TAO_TLS_LOGMGR_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Log/Log_i.h" +#include "orbsvcs/orbsvcs/Log/Log_i.h" -#include "log_serv_export.h" +#include "log_export.h" /** * @class TAO_LogMgr_i @@ -36,7 +36,7 @@ * This factory base class is used to maintain a list of logs * created by it. Logs can also be removed from the list. */ -class TAO_Log_Serv_Export TAO_LogMgr_i : public virtual POA_DsLogAdmin::LogMgr +class TAO_Log_Export TAO_LogMgr_i : public virtual POA_DsLogAdmin::LogMgr { public: @@ -73,6 +73,7 @@ public: /// remove the given entry from the hash table. int remove (DsLogAdmin::LogId id); + protected: /// Define the HASHMAP. @@ -88,6 +89,5 @@ protected: /// A list of the current log ids. DsLogAdmin::LogIdList logid_list_; }; - #include /**/ "ace/post.h" #endif /* TAO_TLS_LOGMGR_I_H */ diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp index 0a99e274bcf..697e70aa687 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/debug.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h index 057140a1c75..763ddace35c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h @@ -18,15 +18,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/DsLogNotificationS.h" +#include "orbsvcs/orbsvcs/DsLogNotificationS.h" -#include "log_serv_export.h" +#include "log_export.h" /** @@ -37,7 +37,7 @@ * This implementation attempts to conform to the telecom * logging specification. */ -class TAO_Log_Serv_Export TAO_LogNotification +class TAO_Log_Export TAO_LogNotification { public: diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp index ddbb9953e8b..74038ad3d20 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp @@ -1,8 +1,8 @@ -#include "orbsvcs/Log/LogRecordStore.h" +#include "orbsvcs/orbsvcs/Log/LogRecordStore.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Log/Log_Constraint_Interpreter.h" -#include "orbsvcs/Log/Log_Constraint_Visitors.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h" +#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h" #include "ace/OS_NS_sys_time.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h index 55025c60e81..c016786c432 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h @@ -19,17 +19,17 @@ #define TAO_LOG_RECORD_STORE_H #include /**/ "ace/pre.h" -#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/DsLogAdminC.h" +#include "orbsvcs/orbsvcs/DsLogAdminC.h" #include "ace/Containers.h" #include "ace/Hash_Map_Manager.h" #include "ace/Null_Mutex.h" -#include "log_serv_export.h" +#include "log_export.h" #define LOG_DEFAULT_MAX_REC_LIST_LEN 30 @@ -44,7 +44,7 @@ * entries. Other features include searching by time ranges. * @@ pradeep: The ACE_RB_Tree will come later. */ -class TAO_Log_Serv_Export TAO_LogRecordStore +class TAO_Log_Export TAO_LogRecordStore { public: diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h index 0cac5583e9d..7416e66f0cb 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h @@ -30,7 +30,7 @@ #include "orbsvcs/DsLogAdminC.h" #include "ace/Containers.h" #include "ace/Hash_Map_Manager.h" -#include "log_serv_export.h" +#include "log_export.h" #include "PersistStore.h" #define PERSISTENT_LOG_FILE_NAME "LOG.DATA" @@ -48,7 +48,7 @@ * entries. Other features include searching by time ranges. * @@ pradeep: The ACE_RB_Tree will come later. */ -class TAO_Log_Serv_Export TAO_LogRecordStore +class TAO_Log_Export TAO_LogRecordStore { public: // = Initialization and termination methods diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h index 7fd1a319398..e365b351982 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h @@ -19,15 +19,15 @@ #define TAO_LOG_CONSTRAINT_INTERPRETER_H #include /**/ "ace/pre.h" -#include "orbsvcs/ETCL/ETCL_Interpreter.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/DsLogAdminC.h" -#include "log_serv_export.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/orbsvcs/DsLogAdminC.h" +#include "log_export.h" class TAO_Log_Constraint_Visitor; @@ -36,7 +36,7 @@ class TAO_Log_Constraint_Visitor; * * @brief "ETCL" Interpreter for the Log queries. */ -class TAO_Log_Serv_Export TAO_Log_Constraint_Interpreter : +class TAO_Log_Export TAO_Log_Constraint_Interpreter : public TAO_ETCL_Interpreter { public: diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index 59f18a7d98f..66c6fc561f9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -1,7 +1,7 @@ #include "Log_Constraint_Visitors.h" -#include "orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/ETCL/ETCL_y.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_y.h" #include "tao/DynamicAny/DynArray_i.h" #include "tao/DynamicAny/DynSequence_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h index abba100cb81..4a4866e222f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h @@ -26,12 +26,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h" -#include "orbsvcs/DsLogAdminC.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h" +#include "orbsvcs/orbsvcs/DsLogAdminC.h" #include "tao/Typecode.h" -#include "log_serv_export.h" +#include "log_export.h" class TAO_ETCL_Constraint; class TAO_ETCL_Literal_Constraint; @@ -42,7 +42,7 @@ class TAO_Log_Property_Constraint; * * @brief "ETCL" Visitor for the Log queries. */ -class TAO_Log_Serv_Export TAO_Log_Constraint_Visitor : +class TAO_Log_Export TAO_Log_Constraint_Visitor : public TAO_ETCL_Constraint_Visitor { public: diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 0e1f1242ced..c98877f9f8e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -1,9 +1,9 @@ -#include "orbsvcs/Log/Log_i.h" +#include "orbsvcs/orbsvcs/Log/Log_i.h" -#include "orbsvcs/Log/Iterator_i.h" -#include "orbsvcs/Log/Log_Constraint_Interpreter.h" -#include "orbsvcs/Log/Log_Constraint_Visitors.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Log/Iterator_i.h" +#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h" +#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/debug.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 249d1a7d460..2181e2d7e72 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -20,16 +20,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Log/LogRecordStore.h" +#include "orbsvcs/orbsvcs/Log/LogRecordStore.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Log/LogNotification.h" -#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" #include "ace/Reactor.h" -#include "log_serv_export.h" +#include "log_export.h" /** * @class TAO_Log_i @@ -39,7 +39,7 @@ * This implementation attempts to conform to the telecom * logging specification. */ -class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log +class TAO_Log_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log { public: diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index 97c9bc2d6b2..7a79e1680f7 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/Log/NotifyLog_i.h" -#include "orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/orbsvcs/Log/NotifyLog_i.h" +#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/orbsvcs/Log/LogNotification.h" ACE_RCSID (Log, NotifyLogConsumer, diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h index 927736b1caf..d20ae88f2dd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h @@ -18,16 +18,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/DsNotifyLogAdminS.h" -#include "orbsvcs/Log/Log_i.h" +#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/orbsvcs/Log/Log_i.h" -#include "notifylog_serv_export.h" +#include "notifylog_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index c170bfc266a..e5119599284 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/Log/NotifyLogFactory_i.h" -#include "orbsvcs/Log/LogNotification.h" -#include "orbsvcs/Log/NotifyLogNotification.h" +#include "orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h" +#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/orbsvcs/Log/NotifyLogNotification.h" ACE_RCSID (Log, NotifyLogFactory_i, @@ -185,12 +185,11 @@ TAO_NotifyLogFactory_i::create_with_id ( ACE_CHECK_RETURN (notify_log._retn ()); // Add to the Hash table.. - if (hash_map_.bind (id, - DsNotifyLogAdmin::NotifyLog::_duplicate (notify_log.in ())) == -1) + if (hash_map_.bind (id, notify_log.in ()) == -1) ACE_THROW_RETURN (CORBA::INTERNAL (), DsNotifyLogAdmin::NotifyLog::_nil ()); - notifier_->object_creation (DsNotifyLogAdmin::NotifyLog::_duplicate (notify_log.in ()), + notifier_->object_creation (notify_log.in (), id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h index c0729d5d837..f887c674f94 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h @@ -18,14 +18,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/DsLogAdminS.h" -#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" #include "NotifyLog_i.h" #if defined(_MSC_VER) @@ -43,7 +43,7 @@ class TAO_NotifyLogNotification; * * @brief The NotifyLogFactory is a factory that is used to create NotifyLogs which are event-aware. */ -class TAO_NotifyLog_Serv_Export TAO_NotifyLogFactory_i : +class TAO_NotifyLog_Export TAO_NotifyLogFactory_i : public POA_DsNotifyLogAdmin::NotifyLogFactory, public TAO_LogMgr_i { diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp index 53434e73a9b..8c161bff3ff 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/Log/LogNotification.h" -#include "orbsvcs/Log/NotifyLogNotification.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/orbsvcs/Log/NotifyLogNotification.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/debug.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h index 4f6b6849b8f..0dc5d4997e5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h @@ -20,17 +20,18 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "notifylog_serv_export.h" +#include "notifylog_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -44,7 +45,7 @@ * * @brief Used to forward log generated events to a logging server. */ -class TAO_NotifyLog_Serv_Export TAO_NotifyLogNotification : +class TAO_NotifyLog_Export TAO_NotifyLogNotification : public TAO_LogNotification, public POA_CosNotifyComm::PushSupplier, public PortableServer::RefCountServantBase diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index 88e58478c13..20bc3f9ea0a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/Log/NotifyLog_i.h" -#include "orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/orbsvcs/Log/NotifyLog_i.h" +#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/orbsvcs/Log/LogNotification.h" ACE_RCSID (Log, NotifyLog_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h index 07f89fd6a98..63fbb632bd0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h @@ -19,17 +19,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/DsNotifyLogAdminS.h" -#include "orbsvcs/Log/Log_i.h" -#include "orbsvcs/Log/NotifyLogConsumer.h" +#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/orbsvcs/Log/Log_i.h" +#include "orbsvcs/orbsvcs/Log/NotifyLogConsumer.h" -#include "notifylog_serv_export.h" +#include "notifylog_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -50,7 +50,7 @@ class TAO_NotifyLogFactory_i; * It is used to log events that pass through the EventChannel. * The class supports the @c destroy> method to destroy the Log. */ -class TAO_NotifyLog_Serv_Export TAO_NotifyLog_i : +class TAO_NotifyLog_Export TAO_NotifyLog_i : public TAO_Log_i, public POA_DsNotifyLogAdmin::NotifyLog, public virtual PortableServer::RefCountServantBase diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp index 89e7127cfa0..bf08953799a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp @@ -3,7 +3,7 @@ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_sys_time.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h index 6945a77b6b0..883b65d21a9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h @@ -17,16 +17,15 @@ #define TAO_PERSIST_STORE_H #include /**/ "ace/pre.h" -#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" #include "tao/Typecode.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/DsLogAdminC.h" +#include "orbsvcs/orbsvcs/DsLogAdminC.h" #include "ace/Mutex.h" -#include "log_serv_export.h" #define PERSIST_LOG_DEFAULT_MAX_REC_LIST_LEN 250 @@ -47,7 +46,7 @@ struct PersistentData * This implementation is to serve for illustration purposes. */ -class TAO_Log_Serv_Export TAO_PersistStore +class TAO_Log_Export TAO_PersistStore { public: diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp index 018bc2388e4..69a8009f059 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp @@ -1,16 +1,16 @@ -#include "orbsvcs/Log/RTEventLog_i.h" -#include "orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/Log/LogNotification.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/EC_Dispatching.h" -#include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/Event/EC_Timeout_Generator.h" -#include "orbsvcs/Event/EC_ObserverStrategy.h" -#include "orbsvcs/Event/EC_ConsumerControl.h" -#include "orbsvcs/Event/EC_SupplierControl.h" +#include "orbsvcs/orbsvcs/Log/RTEventLog_i.h" +#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h" +#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h" +#include "orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h" +#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h" +#include "orbsvcs/orbsvcs/Event/EC_SupplierControl.h" #include "ace/Dynamic_Service.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h index 76e3dc1583f..1fd91e51bca 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h @@ -19,17 +19,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RTEventLogAdminS.h" -#include "orbsvcs/Log/Log_i.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Factory.h" -#include "orbsvcs/Event/EC_Defaults.h" +#include "orbsvcs/orbsvcs/RTEventLogAdminS.h" +#include "orbsvcs/orbsvcs/Log/Log_i.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Defaults.h" #include "rteventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp index 022ff15dfb6..12d794c9a4f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp @@ -1,25 +1,25 @@ -#include "orbsvcs/Log/RTEventLogFactory_i.h" -#include "orbsvcs/Log/LogNotification.h" -#include "orbsvcs/Log/RTEventLogNotification.h" -#include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/ESF/ESF_Peer_Workers.h" -#include "orbsvcs/ESF/ESF_Peer_Admin.h" -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" -#include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/Event/Module_Factory.h" -#include "orbsvcs/Event/Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h" +#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/orbsvcs/Log/RTEventLogNotification.h" +#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "ace/Auto_Ptr.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Event/EC_ConsumerAdmin.i" +#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h index 42b25823cbb..5be76ec71b9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h @@ -18,17 +18,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RTEventLogAdminS.h" +#include "orbsvcs/orbsvcs/RTEventLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/DsLogAdminS.h" -#include "orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "RTEventLog_i.h" #include "rteventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp index 50bf6175c89..5d4a3788101 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp @@ -1,22 +1,22 @@ -#include "orbsvcs/Log/LogNotification.h" -#include "orbsvcs/Log/RTEventLogNotification.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/orbsvcs/Log/RTEventLogNotification.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/debug.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/ESF/ESF_Peer_Workers.h" -#include "orbsvcs/ESF/ESF_Peer_Admin.h" -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_Dispatching.h" -#include "orbsvcs/Event/EC_Filter_Builder.h" -#include "orbsvcs/Event/EC_QOS_Info.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Scheduling_Strategy.h" -#include "orbsvcs/Event/EC_ConsumerControl.h" -#include "orbsvcs/ESF/ESF_RefCount_Guard.h" -#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h" +#include "orbsvcs/orbsvcs/Event/EC_Filter_Builder.h" +#include "orbsvcs/orbsvcs/Event/EC_QOS_Info.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h" +#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h" +#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" ACE_RCSID (Log, RTEventLogNotification, diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h index b6f1718cbce..2ae3fd2ad6c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h @@ -20,18 +20,18 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/RTEventLogAdminS.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/RTEventLogAdminS.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h" #include "rteventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp index 84fc071fcc6..68d87cd2f20 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp @@ -1,16 +1,16 @@ -#include "orbsvcs/Log/RTEventLog_i.h" -#include "orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/Log/LogNotification.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/EC_Dispatching.h" -#include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/Event/EC_Timeout_Generator.h" -#include "orbsvcs/Event/EC_ObserverStrategy.h" -#include "orbsvcs/Event/EC_ConsumerControl.h" -#include "orbsvcs/Event/EC_SupplierControl.h" +#include "orbsvcs/orbsvcs/Log/RTEventLog_i.h" +#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h" +#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h" +#include "orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h" +#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h" +#include "orbsvcs/orbsvcs/Event/EC_SupplierControl.h" #include "ace/Dynamic_Service.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h index 3601e347781..622b25ff925 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h @@ -18,18 +18,18 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RTEventLogAdminS.h" -#include "orbsvcs/Log/Log_i.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Factory.h" -#include "orbsvcs/Event/EC_Defaults.h" -#include "orbsvcs/Log/RTEventLogConsumer.h" +#include "orbsvcs/orbsvcs/RTEventLogAdminS.h" +#include "orbsvcs/orbsvcs/Log/Log_i.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Defaults.h" +#include "orbsvcs/orbsvcs/Log/RTEventLogConsumer.h" #include "rteventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index c00cb3b5580..8e67d9dd58e 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -1,104 +1,239 @@ ## Process this file with automake to create Makefile.in -includedir = @includedir@/orbsvcs - ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. TAO_ROOT = $(top_srcdir) TAO_BUILDDIR = $(top_builddir) - -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl +TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_builddir)/TAO_IDL/tao_idl TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -## Makefile.CosNaming.am +## Makefile.Svc_Utils.am BUILT_SOURCES = \ + TimeBaseS_T.cpp \ + TimeBaseC.cpp \ + TimeBaseS.cpp \ + TimeBaseC.h \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseC.inl \ + TimeBaseS.inl \ + TimeBaseS_T.inl + +CLEANFILES = \ + TimeBaseS_T.cpp \ + TimeBaseC.cpp \ + TimeBaseS.cpp \ + TimeBaseC.h \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseC.inl \ + TimeBaseS.inl \ + TimeBaseS_T.inl + +TimeBaseS_T.cpp TimeBaseC.cpp TimeBaseS.cpp TimeBaseC.h TimeBaseS.h TimeBaseS_T.h TimeBaseC.inl TimeBaseS.inl TimeBaseS_T.inl: TimeBase.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(srcdir)/TimeBase.idl + +BUILT_SOURCES += \ + RtecBaseS_T.cpp \ + RtecBaseC.cpp \ + RtecBaseS.cpp \ + RtecBaseC.h \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseC.inl \ + RtecBaseS.inl \ + RtecBaseS_T.inl + +CLEANFILES += \ + RtecBaseS_T.cpp \ + RtecBaseC.cpp \ + RtecBaseS.cpp \ + RtecBaseC.h \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseC.inl \ + RtecBaseS.inl \ + RtecBaseS_T.inl + +RtecBaseS_T.cpp RtecBaseC.cpp RtecBaseS.cpp RtecBaseC.h RtecBaseS.h RtecBaseS_T.h RtecBaseC.inl RtecBaseS.inl RtecBaseS_T.inl: RtecBase.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(srcdir)/RtecBase.idl + +lib_LTLIBRARIES = libTAO_Svc_Utils.la + +libTAO_Svc_Utils_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DTAO_SVC_UTILS_BUILD_DLL + +libTAO_Svc_Utils_la_SOURCES = \ + TimeBaseC.cpp \ + TimeBaseS.cpp \ + RtecBaseC.cpp \ + RtecBaseS.cpp \ + Time_Utilities.cpp \ + IOR_Multicast.cpp + +libTAO_Svc_Utils_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_Svc_Utils_la_LIBADD = \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS = \ + TimeBaseS_T.h \ + Channel_Clients_T.h \ + TimeBaseC.h \ + TimeBaseS.h \ + RtecBaseS_T.h \ + RtecBaseC.h \ + RtecBaseS.h \ + Time_Utilities.h \ + IOR_Multicast.h \ + TimeBaseS_T.inl \ + Channel_Clients_T.i \ + TimeBaseC.inl \ + TimeBaseS.inl \ + RtecBaseS_T.inl \ + RtecBaseC.inl \ + RtecBaseS.inl \ + Time_Utilities.i \ + TimeBaseS_T.cpp \ + RtecBaseS_T.cpp \ + Channel_Clients_T.cpp + + +## Makefile.CosNaming.am + +BUILT_SOURCES += \ CosNamingS_T.cpp \ - CosNamingC.inl \ - CosNamingS_T.inl \ CosNamingC.cpp \ + CosNamingS.cpp \ CosNamingC.h \ - CosNamingS_T.h + CosNamingS.h \ + CosNamingS_T.h \ + CosNamingC.inl \ + CosNamingS.inl \ + CosNamingS_T.inl -CLEANFILES = \ +CLEANFILES += \ CosNamingS_T.cpp \ - CosNamingC.inl \ - CosNamingS_T.inl \ CosNamingC.cpp \ + CosNamingS.cpp \ CosNamingC.h \ + CosNamingS.h \ CosNamingS_T.h \ - CosNaming-stamp + CosNamingC.inl \ + CosNamingS.inl \ + CosNamingS_T.inl -CosNamingS_T.cpp CosNamingC.inl CosNamingS_T.inl CosNamingC.cpp CosNamingC.h CosNamingS_T.h: CosNaming-stamp +CosNamingS_T.cpp CosNamingC.cpp CosNamingS.cpp CosNamingC.h CosNamingS.h CosNamingS_T.h CosNamingC.inl CosNamingS.inl CosNamingS_T.inl: CosNaming.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h $(srcdir)/CosNaming.idl -CosNaming-stamp: $(srcdir)/CosNaming.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl - @touch $@ +Naming = \ + CosNamingC.cpp \ + CosNamingS.cpp \ + Naming/Entries.cpp \ + Naming/Flat_File_Persistence.cpp \ + Naming/Hash_Naming_Context.cpp \ + Naming/Naming_Context_Interface.cpp \ + Naming/Naming_Loader.cpp \ + Naming/Naming_Utils.cpp \ + Naming/Persistent_Context_Index.cpp \ + Naming/Persistent_Entries.cpp \ + Naming/Persistent_Naming_Context.cpp \ + Naming/Storable.cpp \ + Naming/Storable_Naming_Context.cpp \ + Naming/Storable_Naming_Context_Activator.cpp \ + Naming/Transient_Naming_Context.cpp -lib_LTLIBRARIES = libTAO_CosNaming.la +lib_LTLIBRARIES += libTAO_CosNaming.la libTAO_CosNaming_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_NAMING_BUILD_DLL libTAO_CosNaming_la_SOURCES = \ - CosNamingC.cpp \ - Naming/Naming_Client.cpp + $(Naming) libTAO_CosNaming_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosNaming_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS = \ - CosNamingC.h \ + $(top_builddir)/tao/libTAO_IORTable.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Naming/naming_export.h \ + Channel_Clients_T.h \ CosNamingS_T.h \ - Naming/Naming_Client.h \ - CosNamingC.inl \ + Naming/Transient_Naming_Context.h \ + Naming/Entries.h \ + Naming/Persistent_Context_Index.h \ + Naming/Naming_Loader.h \ + Naming/Naming_Context_Interface.h \ + Naming/Storable_Naming_Context_Activator.h \ + Naming/Naming_Utils.h \ + Naming/Flat_File_Persistence.h \ + Naming/Storable.h \ + Naming/Hash_Naming_Context.h \ + CosNamingC.h \ + CosNamingS.h \ + Naming/Persistent_Naming_Context.h \ + Naming/Storable_Naming_Context.h \ + Naming/Persistent_Entries.h \ + Channel_Clients_T.i \ CosNamingS_T.inl \ + Naming/Storable.inl \ + CosNamingC.inl \ + CosNamingS.inl \ CosNamingS_T.cpp \ - CosNaming.idl + Channel_Clients_T.cpp -EXTRA_DIST = \ - CosNaming.rc ## Makefile.CosProperty.am BUILT_SOURCES += \ CosPropertyServiceS_T.cpp \ - CosPropertyServiceC.inl \ - CosPropertyServiceS.inl \ - CosPropertyServiceS_T.inl \ CosPropertyServiceC.cpp \ CosPropertyServiceS.cpp \ CosPropertyServiceC.h \ CosPropertyServiceS.h \ - CosPropertyServiceS_T.h + CosPropertyServiceS_T.h \ + CosPropertyServiceC.inl \ + CosPropertyServiceS.inl \ + CosPropertyServiceS_T.inl CLEANFILES += \ CosPropertyServiceS_T.cpp \ - CosPropertyServiceC.inl \ - CosPropertyServiceS.inl \ - CosPropertyServiceS_T.inl \ CosPropertyServiceC.cpp \ CosPropertyServiceS.cpp \ CosPropertyServiceC.h \ CosPropertyServiceS.h \ CosPropertyServiceS_T.h \ - CosPropertyService-stamp - -CosPropertyServiceS_T.cpp CosPropertyServiceC.inl CosPropertyServiceS.inl CosPropertyServiceS_T.inl CosPropertyServiceC.cpp CosPropertyServiceS.cpp CosPropertyServiceC.h CosPropertyServiceS.h CosPropertyServiceS_T.h: CosPropertyService-stamp + CosPropertyServiceC.inl \ + CosPropertyServiceS.inl \ + CosPropertyServiceS_T.inl -CosPropertyService-stamp: $(srcdir)/CosPropertyService.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h $(srcdir)/CosPropertyService.idl - @touch $@ +CosPropertyServiceS_T.cpp CosPropertyServiceC.cpp CosPropertyServiceS.cpp CosPropertyServiceC.h CosPropertyServiceS.h CosPropertyServiceS_T.h CosPropertyServiceC.inl CosPropertyServiceS.inl CosPropertyServiceS_T.inl: CosPropertyService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property/property_export.h $(srcdir)/CosPropertyService.idl Property = \ CosPropertyServiceC.cpp \ @@ -112,8 +247,6 @@ libTAO_CosProperty_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_PROPERTY_BUILD_DLL libTAO_CosProperty_la_SOURCES = \ @@ -123,120 +256,112 @@ libTAO_CosProperty_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosProperty_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CosPropertyServiceC.h \ - CosPropertyServiceS.h \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ CosPropertyServiceS_T.h \ + Channel_Clients_T.h \ Property/CosPropertyService_i.h \ - CosPropertyServiceC.inl \ - CosPropertyServiceS.inl \ + CosPropertyServiceC.h \ + CosPropertyServiceS.h \ CosPropertyServiceS_T.inl \ + Channel_Clients_T.i \ CosPropertyServiceS_T.cpp \ - CosPropertyService.idl + Channel_Clients_T.cpp -EXTRA_DIST += \ - CosProperty.rc ## Makefile.AV.am BUILT_SOURCES += \ AVStreamsS_T.cpp \ - AVStreamsC.inl \ - AVStreamsS.inl \ - AVStreamsS_T.inl \ AVStreamsC.cpp \ AVStreamsS.cpp \ AVStreamsC.h \ AVStreamsS.h \ - AVStreamsS_T.h + AVStreamsS_T.h \ + AVStreamsC.inl \ + AVStreamsS.inl \ + AVStreamsS_T.inl CLEANFILES += \ AVStreamsS_T.cpp \ - AVStreamsC.inl \ - AVStreamsS.inl \ - AVStreamsS_T.inl \ AVStreamsC.cpp \ AVStreamsS.cpp \ AVStreamsC.h \ AVStreamsS.h \ AVStreamsS_T.h \ - AVStreams-stamp - -AVStreamsS_T.cpp AVStreamsC.inl AVStreamsS.inl AVStreamsS_T.inl AVStreamsC.cpp AVStreamsS.cpp AVStreamsC.h AVStreamsS.h AVStreamsS_T.h: AVStreams-stamp + AVStreamsC.inl \ + AVStreamsS.inl \ + AVStreamsS_T.inl -AVStreams-stamp: $(srcdir)/AVStreams.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl - @touch $@ +AVStreamsS_T.cpp AVStreamsC.cpp AVStreamsS.cpp AVStreamsC.h AVStreamsS.h AVStreamsS_T.h AVStreamsC.inl AVStreamsS.inl AVStreamsS_T.inl: AVStreams.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h $(srcdir)/AVStreams.idl BUILT_SOURCES += \ Null_MediaCtrlS_T.cpp \ - Null_MediaCtrlC.inl \ - Null_MediaCtrlS.inl \ - Null_MediaCtrlS_T.inl \ Null_MediaCtrlC.cpp \ Null_MediaCtrlS.cpp \ - Null_MediaCtrlC.h \ - Null_MediaCtrlS.h \ - Null_MediaCtrlS_T.h + Null_MediaCtrlS_T.h \ + Null_MediaCtrlC.inl \ + Null_MediaCtrlS.inl \ + Null_MediaCtrlS_T.inl CLEANFILES += \ Null_MediaCtrlS_T.cpp \ - Null_MediaCtrlC.inl \ - Null_MediaCtrlS.inl \ - Null_MediaCtrlS_T.inl \ Null_MediaCtrlC.cpp \ Null_MediaCtrlS.cpp \ - Null_MediaCtrlC.h \ - Null_MediaCtrlS.h \ Null_MediaCtrlS_T.h \ - Null_MediaCtrl-stamp - -Null_MediaCtrlS_T.cpp Null_MediaCtrlC.inl Null_MediaCtrlS.inl Null_MediaCtrlS_T.inl Null_MediaCtrlC.cpp Null_MediaCtrlS.cpp Null_MediaCtrlC.h Null_MediaCtrlS.h Null_MediaCtrlS_T.h: Null_MediaCtrl-stamp + Null_MediaCtrlC.inl \ + Null_MediaCtrlS.inl \ + Null_MediaCtrlS_T.inl -Null_MediaCtrl-stamp: $(srcdir)/Null_MediaCtrl.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl - @touch $@ +Null_MediaCtrlS_T.cpp Null_MediaCtrlC.cpp Null_MediaCtrlS.cpp Null_MediaCtrlS_T.h Null_MediaCtrlC.inl Null_MediaCtrlS.inl Null_MediaCtrlS_T.inl: Null_MediaCtrl.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl BUILT_SOURCES += \ sfpS_T.cpp \ - sfpC.inl \ - sfpS.inl \ - sfpS_T.inl \ sfpC.cpp \ sfpS.cpp \ sfpC.h \ sfpS.h \ - sfpS_T.h + sfpS_T.h \ + sfpC.inl \ + sfpS.inl \ + sfpS_T.inl CLEANFILES += \ sfpS_T.cpp \ - sfpC.inl \ - sfpS.inl \ - sfpS_T.inl \ sfpC.cpp \ sfpS.cpp \ sfpC.h \ sfpS.h \ sfpS_T.h \ - sfp-stamp - -sfpS_T.cpp sfpC.inl sfpS.inl sfpS_T.inl sfpC.cpp sfpS.cpp sfpC.h sfpS.h sfpS_T.h: sfp-stamp + sfpC.inl \ + sfpS.inl \ + sfpS_T.inl -sfp-stamp: $(srcdir)/sfp.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl - @touch $@ +sfpS_T.cpp sfpC.cpp sfpS.cpp sfpC.h sfpS.h sfpS_T.h sfpC.inl sfpS.inl sfpS_T.inl: sfp.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h $(srcdir)/sfp.idl AV = \ + AVStreamsC.cpp \ + AVStreamsS.cpp \ + Null_MediaCtrlC.cpp \ + Null_MediaCtrlS.cpp \ + sfpC.cpp \ + sfpS.cpp \ AV/AVStreams_i.cpp \ AV/AV_Core.cpp \ AV/Endpoint_Strategy.cpp \ AV/Fill_ACE_QoS.cpp \ AV/FlowSpec_Entry.cpp \ AV/MCast.cpp \ + AV/md5c.cpp \ AV/Policy.cpp \ AV/Protocol_Factory.cpp \ AV/QoS_UDP.cpp \ @@ -244,20 +369,13 @@ AV = \ AV/RTCP_Channel.cpp \ AV/RTCP_Packet.cpp \ AV/RTP.cpp \ - AV/SCTP_SEQ.cpp \ AV/TCP.cpp \ AV/Transport.cpp \ AV/UDP.cpp \ AV/default_resource.cpp \ - AV/md5c.cpp \ AV/media_timer.cpp \ AV/sfp.cpp \ - AVStreamsC.cpp \ - AVStreamsS.cpp \ - Null_MediaCtrlC.cpp \ - Null_MediaCtrlS.cpp \ - sfpC.cpp \ - sfpS.cpp + AV/SCTP_SEQ.cpp lib_LTLIBRARIES += libTAO_AV.la @@ -266,8 +384,6 @@ libTAO_AV_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_AV_BUILD_DLL libTAO_AV_la_SOURCES = \ @@ -277,13 +393,26 @@ libTAO_AV_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_AV_la_LIBADD = \ - libTAO_CosNaming.la \ - libTAO_CosProperty.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + libTAO_CosNaming.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + libTAO_CosProperty.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + AV/TCP.h \ + AV/Transport.h \ + sfpC.h \ + sfpS.h \ + AVStreamsC.h \ + AVStreamsS.h \ + Channel_Clients_T.h \ AV/AVStreams_i.h \ AV/AV_Core.h \ AV/AV_export.h \ @@ -293,6 +422,7 @@ nobase_include_HEADERS += \ AV/FlowSpec_Entry.h \ AV/Flows_T.h \ AV/MCast.h \ + AV/md5.h \ AV/Policy.h \ AV/Protocol_Factory.h \ AV/QoS_UDP.h \ @@ -301,95 +431,74 @@ nobase_include_HEADERS += \ AV/RTCP_Packet.h \ AV/RTP.h \ AV/Resource_Factory.h \ - AV/SCTP_SEQ.h \ - AV/TCP.h \ - AV/Transport.h \ AV/UDP.h \ AV/default_resource.h \ AV/global.h \ - AV/md5.h \ AV/media_timer.h \ AV/ntp-time.h \ AV/sfp.h \ - AVStreamsC.h \ - AVStreamsS.h \ - AVStreamsS_T.h \ - Channel_Clients_T.h \ - Null_MediaCtrlC.h \ - Null_MediaCtrlS.h \ + AV/SCTP_SEQ.h \ Null_MediaCtrlS_T.h \ - sfpC.h \ - sfpS.h \ + AVStreamsS_T.h \ sfpS_T.h \ - AV/AVStreams_i.i \ - AV/FlowSpec_Entry.i \ - AV/MCast.i \ - AV/Policy.i \ AV/QoS_UDP.i \ AV/Transport.i \ + sfpC.inl \ + sfpS.inl \ AV/UDP.i \ + AV/AVStreams_i.i \ + AV/Policy.i \ + AV/FlowSpec_Entry.i \ + AV/MCast.i \ AVStreamsC.inl \ AVStreamsS.inl \ - AVStreamsS_T.inl \ - Channel_Clients_T.i \ - Null_MediaCtrlC.inl \ - Null_MediaCtrlS.inl \ Null_MediaCtrlS_T.inl \ - sfpC.inl \ - sfpS.inl \ + AVStreamsS_T.inl \ sfpS_T.inl \ - AV/Endpoint_Strategy_T.cpp \ - AV/Flows_T.cpp \ + Channel_Clients_T.i \ AVStreamsS_T.cpp \ - Channel_Clients_T.cpp \ Null_MediaCtrlS_T.cpp \ sfpS_T.cpp \ - AVStreams.idl \ - Null_MediaCtrl.idl \ - sfp.idl + Channel_Clients_T.cpp \ + AV/Endpoint_Strategy_T.cpp \ + AV/Flows_T.cpp -EXTRA_DIST += \ - AV.rc ## Makefile.CosConcurrency.am BUILT_SOURCES += \ CosConcurrencyControlS_T.cpp \ - CosConcurrencyControlC.inl \ - CosConcurrencyControlS.inl \ - CosConcurrencyControlS_T.inl \ CosConcurrencyControlC.cpp \ CosConcurrencyControlS.cpp \ CosConcurrencyControlC.h \ CosConcurrencyControlS.h \ - CosConcurrencyControlS_T.h + CosConcurrencyControlS_T.h \ + CosConcurrencyControlC.inl \ + CosConcurrencyControlS.inl \ + CosConcurrencyControlS_T.inl CLEANFILES += \ CosConcurrencyControlS_T.cpp \ - CosConcurrencyControlC.inl \ - CosConcurrencyControlS.inl \ - CosConcurrencyControlS_T.inl \ CosConcurrencyControlC.cpp \ CosConcurrencyControlS.cpp \ CosConcurrencyControlC.h \ CosConcurrencyControlS.h \ CosConcurrencyControlS_T.h \ - CosConcurrencyControl-stamp - -CosConcurrencyControlS_T.cpp CosConcurrencyControlC.inl CosConcurrencyControlS.inl CosConcurrencyControlS_T.inl CosConcurrencyControlC.cpp CosConcurrencyControlS.cpp CosConcurrencyControlC.h CosConcurrencyControlS.h CosConcurrencyControlS_T.h: CosConcurrencyControl-stamp + CosConcurrencyControlC.inl \ + CosConcurrencyControlS.inl \ + CosConcurrencyControlS_T.inl -CosConcurrencyControl-stamp: $(srcdir)/CosConcurrencyControl.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h $(srcdir)/CosConcurrencyControl.idl - @touch $@ +CosConcurrencyControlS_T.cpp CosConcurrencyControlC.cpp CosConcurrencyControlS.cpp CosConcurrencyControlC.h CosConcurrencyControlS.h CosConcurrencyControlS_T.h CosConcurrencyControlC.inl CosConcurrencyControlS.inl CosConcurrencyControlS_T.inl: CosConcurrencyControl.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=Concurrency/concurrency_export.h $(srcdir)/CosConcurrencyControl.idl Concurrency = \ - Concurrency/CC_Lock.cpp \ + CosConcurrencyControlC.cpp \ + CosConcurrencyControlS.cpp \ Concurrency/CC_LockSet.cpp \ + Concurrency/CC_Lock.cpp \ Concurrency/CC_LockSetFactory.cpp \ Concurrency/Concurrency_Loader.cpp \ - Concurrency/Concurrency_Utils.cpp \ - CosConcurrencyControlC.cpp \ - CosConcurrencyControlS.cpp + Concurrency/Concurrency_Utils.cpp lib_LTLIBRARIES += libTAO_CosConcurrency.la @@ -398,8 +507,6 @@ libTAO_CosConcurrency_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_CONCURRENCY_BUILD_DLL libTAO_CosConcurrency_la_SOURCES = \ @@ -409,351 +516,101 @@ libTAO_CosConcurrency_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosConcurrency_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - Concurrency/CC_Lock.h \ - Concurrency/CC_LockSet.h \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Channel_Clients_T.h \ + CosConcurrencyControlS_T.h \ Concurrency/CC_LockSetFactory.h \ - Concurrency/Concurrency_Loader.h \ - Concurrency/Concurrency_Utils.h \ CosConcurrencyControlC.h \ CosConcurrencyControlS.h \ - CosConcurrencyControlS_T.h \ - CosConcurrencyControlC.inl \ - CosConcurrencyControlS.inl \ + Concurrency/Concurrency_Utils.h \ + Concurrency/CC_LockSet.h \ + Concurrency/Concurrency_Loader.h \ + Concurrency/CC_Lock.h \ + Channel_Clients_T.i \ CosConcurrencyControlS_T.inl \ CosConcurrencyControlS_T.cpp \ - CosConcurrencyControl.idl + Channel_Clients_T.cpp -EXTRA_DIST += \ - CosConcurrency.rc ## Makefile.CosEvent.am -if !BUILD_MINIMUM_CORBA - -BUILT_SOURCES += \ - CosEventChannelAdminS_T.cpp \ - CosEventChannelAdminC.inl \ - CosEventChannelAdminS_T.inl \ - CosEventChannelAdminC.cpp \ - CosEventChannelAdminC.h \ - CosEventChannelAdminS_T.h - -CLEANFILES += \ - CosEventChannelAdminS_T.cpp \ - CosEventChannelAdminC.inl \ - CosEventChannelAdminS_T.inl \ - CosEventChannelAdminC.cpp \ - CosEventChannelAdminC.h \ - CosEventChannelAdminS_T.h \ - CosEventChannelAdmin-stamp - -CosEventChannelAdminS_T.cpp CosEventChannelAdminC.inl CosEventChannelAdminS_T.inl CosEventChannelAdminC.cpp CosEventChannelAdminC.h CosEventChannelAdminS_T.h: CosEventChannelAdmin-stamp - -CosEventChannelAdmin-stamp: $(srcdir)/CosEventChannelAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventChannelAdmin.idl - @touch $@ - -BUILT_SOURCES += \ - CosEventCommS_T.cpp \ - CosEventCommC.inl \ - CosEventCommS_T.inl \ - CosEventCommC.cpp \ - CosEventCommC.h \ - CosEventCommS_T.h - -CLEANFILES += \ - CosEventCommS_T.cpp \ - CosEventCommC.inl \ - CosEventCommS_T.inl \ - CosEventCommC.cpp \ - CosEventCommC.h \ - CosEventCommS_T.h \ - CosEventComm-stamp - -CosEventCommS_T.cpp CosEventCommC.inl CosEventCommS_T.inl CosEventCommC.cpp CosEventCommC.h CosEventCommS_T.h: CosEventComm-stamp - -CosEventComm-stamp: $(srcdir)/CosEventComm.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosEventComm.idl - @touch $@ - -BUILT_SOURCES += \ - CosTypedEventChannelAdminS_T.cpp \ - CosTypedEventChannelAdminC.inl \ - CosTypedEventChannelAdminS_T.inl \ - CosTypedEventChannelAdminC.cpp \ - CosTypedEventChannelAdminC.h \ - CosTypedEventChannelAdminS_T.h - -CLEANFILES += \ - CosTypedEventChannelAdminS_T.cpp \ - CosTypedEventChannelAdminC.inl \ - CosTypedEventChannelAdminS_T.inl \ - CosTypedEventChannelAdminC.cpp \ - CosTypedEventChannelAdminC.h \ - CosTypedEventChannelAdminS_T.h \ - CosTypedEventChannelAdmin-stamp - -CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS_T.inl CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminS_T.h: CosTypedEventChannelAdmin-stamp - -CosTypedEventChannelAdmin-stamp: $(srcdir)/CosTypedEventChannelAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventChannelAdmin.idl - @touch $@ - BUILT_SOURCES += \ CosTypedEventCommS_T.cpp \ - CosTypedEventCommC.inl \ - CosTypedEventCommS_T.inl \ CosTypedEventCommC.cpp \ + CosTypedEventCommS.cpp \ CosTypedEventCommC.h \ - CosTypedEventCommS_T.h + CosTypedEventCommS.h \ + CosTypedEventCommS_T.h \ + CosTypedEventCommC.inl \ + CosTypedEventCommS.inl \ + CosTypedEventCommS_T.inl CLEANFILES += \ CosTypedEventCommS_T.cpp \ - CosTypedEventCommC.inl \ - CosTypedEventCommS_T.inl \ CosTypedEventCommC.cpp \ + CosTypedEventCommS.cpp \ CosTypedEventCommC.h \ + CosTypedEventCommS.h \ CosTypedEventCommS_T.h \ - CosTypedEventComm-stamp - -CosTypedEventCommS_T.cpp CosTypedEventCommC.inl CosTypedEventCommS_T.inl CosTypedEventCommC.cpp CosTypedEventCommC.h CosTypedEventCommS_T.h: CosTypedEventComm-stamp - -CosTypedEventComm-stamp: $(srcdir)/CosTypedEventComm.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h $(srcdir)/CosTypedEventComm.idl - @touch $@ + CosTypedEventCommC.inl \ + CosTypedEventCommS.inl \ + CosTypedEventCommS_T.inl -lib_LTLIBRARIES += libTAO_CosEvent.la +CosTypedEventCommS_T.cpp CosTypedEventCommC.cpp CosTypedEventCommS.cpp CosTypedEventCommC.h CosTypedEventCommS.h CosTypedEventCommS_T.h CosTypedEventCommC.inl CosTypedEventCommS.inl CosTypedEventCommS_T.inl: CosTypedEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosTypedEventComm.idl -libTAO_CosEvent_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DTAO_EVENT_BUILD_DLL - -libTAO_CosEvent_la_SOURCES = \ - CosEventChannelAdminC.cpp \ - CosEventCommC.cpp \ +BUILT_SOURCES += \ + CosTypedEventChannelAdminS_T.cpp \ CosTypedEventChannelAdminC.cpp \ - CosTypedEventCommC.cpp - -libTAO_CosEvent_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_CosEvent_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CosEventChannelAdminC.h \ - CosEventChannelAdminS_T.h \ - CosEventCommC.h \ - CosEventCommS_T.h \ + CosTypedEventChannelAdminS.cpp \ CosTypedEventChannelAdminC.h \ + CosTypedEventChannelAdminS.h \ CosTypedEventChannelAdminS_T.h \ - CosTypedEventCommC.h \ - CosTypedEventCommS_T.h \ - CosEventChannelAdminC.inl \ - CosEventChannelAdminS_T.inl \ - CosEventCommC.inl \ - CosEventCommS_T.inl \ CosTypedEventChannelAdminC.inl \ - CosTypedEventChannelAdminS_T.inl \ - CosTypedEventCommC.inl \ - CosTypedEventCommS_T.inl \ - CosEventChannelAdminS_T.cpp \ - CosEventCommS_T.cpp \ - CosTypedEventChannelAdminS_T.cpp \ - CosTypedEventCommS_T.cpp \ - CosEventChannelAdmin.idl \ - CosEventComm.idl \ - CosTypedEventChannelAdmin.idl \ - CosTypedEventComm.idl - -endif !BUILD_MINIMUM_CORBA - -EXTRA_DIST += \ - CosEvent.rc - -## Makefile.Svc_Utils.am - -BUILT_SOURCES += \ - RtecBaseS_T.cpp \ - RtecBaseC.inl \ - RtecBaseS.inl \ - RtecBaseS_T.inl \ - RtecBaseC.cpp \ - RtecBaseS.cpp \ - RtecBaseC.h \ - RtecBaseS.h \ - RtecBaseS_T.h - -CLEANFILES += \ - RtecBaseS_T.cpp \ - RtecBaseC.inl \ - RtecBaseS.inl \ - RtecBaseS_T.inl \ - RtecBaseC.cpp \ - RtecBaseS.cpp \ - RtecBaseC.h \ - RtecBaseS.h \ - RtecBaseS_T.h \ - RtecBase-stamp - -RtecBaseS_T.cpp RtecBaseC.inl RtecBaseS.inl RtecBaseS_T.inl RtecBaseC.cpp RtecBaseS.cpp RtecBaseC.h RtecBaseS.h RtecBaseS_T.h: RtecBase-stamp - -RtecBase-stamp: $(srcdir)/RtecBase.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl - @touch $@ - -BUILT_SOURCES += \ - TimeBaseS_T.cpp \ - TimeBaseC.inl \ - TimeBaseS.inl \ - TimeBaseS_T.inl \ - TimeBaseC.cpp \ - TimeBaseS.cpp \ - TimeBaseC.h \ - TimeBaseS.h \ - TimeBaseS_T.h + CosTypedEventChannelAdminS.inl \ + CosTypedEventChannelAdminS_T.inl CLEANFILES += \ - TimeBaseS_T.cpp \ - TimeBaseC.inl \ - TimeBaseS.inl \ - TimeBaseS_T.inl \ - TimeBaseC.cpp \ - TimeBaseS.cpp \ - TimeBaseC.h \ - TimeBaseS.h \ - TimeBaseS_T.h \ - TimeBase-stamp - -TimeBaseS_T.cpp TimeBaseC.inl TimeBaseS.inl TimeBaseS_T.inl TimeBaseC.cpp TimeBaseS.cpp TimeBaseC.h TimeBaseS.h TimeBaseS_T.h: TimeBase-stamp - -TimeBase-stamp: $(srcdir)/TimeBase.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl - @touch $@ - -lib_LTLIBRARIES += libTAO_Svc_Utils.la - -libTAO_Svc_Utils_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_SVC_UTILS_BUILD_DLL - -libTAO_Svc_Utils_la_SOURCES = \ - IOR_Multicast.cpp \ - RtecBaseC.cpp \ - RtecBaseS.cpp \ - Shutdown_Utilities.cpp \ - TimeBaseC.cpp \ - TimeBaseS.cpp \ - Time_Utilities.cpp - -libTAO_Svc_Utils_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_Svc_Utils_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - IOR_Multicast.h \ - RtecBaseC.h \ - RtecBaseS.h \ - RtecBaseS_T.h \ - Shutdown_Utilities.h \ - TimeBaseC.h \ - TimeBaseS.h \ - TimeBaseS_T.h \ - Time_Utilities.h \ - RtecBaseC.inl \ - RtecBaseS.inl \ - RtecBaseS_T.inl \ - TimeBaseC.inl \ - TimeBaseS.inl \ - TimeBaseS_T.inl \ - Time_Utilities.i \ - RtecBaseS_T.cpp \ - TimeBaseS_T.cpp \ - RtecBase.idl \ - TimeBase.idl - -EXTRA_DIST += \ - Svc_Utils.rc - -## Makefile.CosEvent_Skel.am - -if !BUILD_MINIMUM_CORBA - -lib_LTLIBRARIES += libTAO_CosEvent_Skel.la - -libTAO_CosEvent_Skel_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DTAO_EVENT_SKEL_BUILD_DLL - -libTAO_CosEvent_Skel_la_SOURCES = \ - CosEventChannelAdminS.cpp \ - CosEventCommS.cpp \ + CosTypedEventChannelAdminS_T.cpp \ + CosTypedEventChannelAdminC.cpp \ CosTypedEventChannelAdminS.cpp \ - CosTypedEventCommS.cpp - -libTAO_CosEvent_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_CosEvent_Skel_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CosEventChannelAdminS.h \ - CosEventCommS.h \ + CosTypedEventChannelAdminC.h \ CosTypedEventChannelAdminS.h \ - CosTypedEventCommS.h \ - CosEventChannelAdminS.inl \ - CosEventCommS.inl \ + CosTypedEventChannelAdminS_T.h \ + CosTypedEventChannelAdminC.inl \ CosTypedEventChannelAdminS.inl \ - CosTypedEventCommS.inl - -endif !BUILD_MINIMUM_CORBA + CosTypedEventChannelAdminS_T.inl -EXTRA_DIST += \ - CosEvent_Skel.rc - -## Makefile.CosEvent_Serv.am - -if !BUILD_MINIMUM_CORBA +CosTypedEventChannelAdminS_T.cpp CosTypedEventChannelAdminC.cpp CosTypedEventChannelAdminS.cpp CosTypedEventChannelAdminC.h CosTypedEventChannelAdminS.h CosTypedEventChannelAdminS_T.h CosTypedEventChannelAdminC.inl CosTypedEventChannelAdminS.inl CosTypedEventChannelAdminS_T.inl: CosTypedEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosTypedEventChannelAdmin.idl CosEvent = \ + CosTypedEventCommC.cpp \ + CosTypedEventChannelAdminC.cpp \ + CosTypedEventCommS.cpp \ + CosTypedEventChannelAdminS.cpp \ + CosEvent/CEC_TypedEvent.cpp \ + CosEvent/CEC_TypedEventChannel.cpp \ + CosEvent/CEC_TypedProxyPushConsumer.cpp \ + CosEvent/CEC_TypedConsumerAdmin.cpp \ + CosEvent/CEC_TypedSupplierAdmin.cpp \ + CosEvent/CEC_DynamicImplementation.cpp \ + CosEventCommC.cpp \ + CosEventChannelAdminC.cpp \ + CosEventCommS.cpp \ + CosEventChannelAdminS.cpp \ CosEvent/CEC_ConsumerAdmin.cpp \ CosEvent/CEC_ConsumerControl.cpp \ CosEvent/CEC_Default_Factory.cpp \ CosEvent/CEC_Dispatching.cpp \ CosEvent/CEC_Dispatching_Task.cpp \ - CosEvent/CEC_DynamicImplementation.cpp \ CosEvent/CEC_EventChannel.cpp \ CosEvent/CEC_Event_Loader.cpp \ CosEvent/CEC_Factory.cpp \ @@ -767,160 +624,172 @@ CosEvent = \ CosEvent/CEC_Reactive_Pulling_Strategy.cpp \ CosEvent/CEC_Reactive_SupplierControl.cpp \ CosEvent/CEC_SupplierAdmin.cpp \ - CosEvent/CEC_SupplierControl.cpp \ - CosEvent/CEC_TypedConsumerAdmin.cpp \ - CosEvent/CEC_TypedEvent.cpp \ - CosEvent/CEC_TypedEventChannel.cpp \ - CosEvent/CEC_TypedProxyPushConsumer.cpp \ - CosEvent/CEC_TypedSupplierAdmin.cpp + CosEvent/CEC_SupplierControl.cpp -lib_LTLIBRARIES += libTAO_CosEvent_Serv.la +lib_LTLIBRARIES += libTAO_CosEvent.la -libTAO_CosEvent_Serv_la_CPPFLAGS = \ +libTAO_CosEvent_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DTAO_EVENT_SERV_BUILD_DLL + -DTAO_EVENT_BUILD_DLL -DTAO_NOTIFY_BUILD_DLL -libTAO_CosEvent_Serv_la_SOURCES = \ +libTAO_CosEvent_la_SOURCES = \ $(CosEvent) -libTAO_CosEvent_Serv_la_LDFLAGS = \ +libTAO_CosEvent_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -libTAO_CosEvent_Serv_la_LIBADD = \ - libTAO_Svc_Utils.la \ - libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CosEvent/CEC_ConsumerAdmin.h \ +libTAO_CosEvent_la_LIBADD = \ + libTAO_CosNaming.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_IFR_Client.la \ + $(top_builddir)/tao/libTAO_DynamicInterface.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + CosEvent/CEC_Factory.h \ + CosEvent/CEC_Pulling_Strategy.h \ + CosEvent/CEC_DynamicImplementation.h \ CosEvent/CEC_ConsumerControl.h \ - CosEvent/CEC_Default_Factory.h \ + CosTypedEventChannelAdminC.h \ + CosTypedEventCommC.h \ + CosTypedEventChannelAdminS.h \ + CosTypedEventCommS.h \ CosEvent/CEC_Dispatching.h \ - CosEvent/CEC_Dispatching_Task.h \ - CosEvent/CEC_DynamicImplementation.h \ - CosEvent/CEC_EventChannel.h \ - CosEvent/CEC_Event_Loader.h \ - CosEvent/CEC_Factory.h \ - CosEvent/CEC_MT_Dispatching.h \ - CosEvent/CEC_ProxyPullConsumer.h \ - CosEvent/CEC_ProxyPullSupplier.h \ - CosEvent/CEC_ProxyPushConsumer.h \ + CosEvent/CEC_ConsumerAdmin.h \ CosEvent/CEC_ProxyPushSupplier.h \ - CosEvent/CEC_Pulling_Strategy.h \ - CosEvent/CEC_Reactive_ConsumerControl.h \ - CosEvent/CEC_Reactive_Pulling_Strategy.h \ - CosEvent/CEC_Reactive_SupplierControl.h \ - CosEvent/CEC_SupplierAdmin.h \ - CosEvent/CEC_SupplierControl.h \ + CosEvent/CEC_ProxyPushConsumer.h \ + CosEventChannelAdminC.h \ CosEvent/CEC_TypedConsumerAdmin.h \ + CosEventChannelAdminS.h \ + CosEvent/CEC_EventChannel.h \ + CosEventCommC.h \ + CosEventCommS.h \ + CosEvent/CEC_SupplierAdmin.h \ + CosEvent/CEC_ProxyPullSupplier.h \ + CosEvent/CEC_ProxyPullConsumer.h \ CosEvent/CEC_TypedEvent.h \ CosEvent/CEC_TypedEventChannel.h \ - CosEvent/CEC_TypedProxyPushConsumer.h \ + CosEvent/CEC_Reactive_SupplierControl.h \ CosEvent/CEC_TypedSupplierAdmin.h \ - CosEvent/CEC_ConsumerAdmin.i \ + CosEvent/CEC_Default_Factory.h \ + CosEvent/CEC_TypedProxyPushConsumer.h \ + CosEvent/CEC_SupplierControl.h \ + CosEvent/CEC_Dispatching_Task.h \ + CosEvent/CEC_Reactive_ConsumerControl.h \ + CosEvent/CEC_Event_Loader.h \ + CosEvent/CEC_Reactive_Pulling_Strategy.h \ + CosEvent/CEC_MT_Dispatching.h \ + CosTypedEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.h \ + Channel_Clients_T.h \ + CosTypedEventCommS_T.h \ + CosEventCommS_T.h \ + CosEvent/CEC_Factory.i \ + CosEvent/CEC_Pulling_Strategy.i \ + CosEvent/CEC_DynamicImplementation.i \ CosEvent/CEC_ConsumerControl.i \ - CosEvent/CEC_Default_Factory.i \ + CosTypedEventChannelAdminC.inl \ + CosTypedEventCommC.inl \ + CosTypedEventChannelAdminS.inl \ + CosTypedEventCommS.inl \ CosEvent/CEC_Dispatching.i \ - CosEvent/CEC_Dispatching_Task.i \ - CosEvent/CEC_DynamicImplementation.i \ - CosEvent/CEC_EventChannel.i \ - CosEvent/CEC_Factory.i \ - CosEvent/CEC_MT_Dispatching.i \ - CosEvent/CEC_ProxyPullConsumer.i \ - CosEvent/CEC_ProxyPullSupplier.i \ - CosEvent/CEC_ProxyPushConsumer.i \ + CosEvent/CEC_ConsumerAdmin.i \ CosEvent/CEC_ProxyPushSupplier.i \ - CosEvent/CEC_Pulling_Strategy.i \ - CosEvent/CEC_Reactive_ConsumerControl.i \ - CosEvent/CEC_Reactive_Pulling_Strategy.i \ - CosEvent/CEC_Reactive_SupplierControl.i \ - CosEvent/CEC_SupplierAdmin.i \ - CosEvent/CEC_SupplierControl.i \ + CosEvent/CEC_ProxyPushConsumer.i \ + CosEventChannelAdminC.inl \ CosEvent/CEC_TypedConsumerAdmin.i \ + CosEventChannelAdminS.inl \ + CosEvent/CEC_EventChannel.i \ + CosEventCommC.inl \ + CosEventCommS.inl \ + CosEvent/CEC_SupplierAdmin.i \ + CosEvent/CEC_ProxyPullSupplier.i \ + CosEvent/CEC_ProxyPullConsumer.i \ CosEvent/CEC_TypedEvent.i \ CosEvent/CEC_TypedEventChannel.i \ + CosEvent/CEC_Reactive_SupplierControl.i \ + CosEvent/CEC_TypedSupplierAdmin.i \ + CosEvent/CEC_Default_Factory.i \ CosEvent/CEC_TypedProxyPushConsumer.i \ - CosEvent/CEC_TypedSupplierAdmin.i - -endif !BUILD_MINIMUM_CORBA + CosEvent/CEC_SupplierControl.i \ + CosEvent/CEC_Dispatching_Task.i \ + CosEvent/CEC_Reactive_ConsumerControl.i \ + CosEvent/CEC_Reactive_Pulling_Strategy.i \ + CosEvent/CEC_MT_Dispatching.i \ + CosTypedEventChannelAdminS_T.inl \ + CosEventChannelAdminS_T.inl \ + Channel_Clients_T.i \ + CosTypedEventCommS_T.inl \ + CosEventCommS_T.inl \ + CosTypedEventCommS_T.cpp \ + CosTypedEventChannelAdminS_T.cpp \ + CosEventCommS_T.cpp \ + CosEventChannelAdminS_T.cpp \ + Channel_Clients_T.cpp -EXTRA_DIST += \ - CosEvent_Serv.rc ## Makefile.CosLifeCycle.am BUILT_SOURCES += \ CosLifeCycleS_T.cpp \ - CosLifeCycleC.inl \ - CosLifeCycleS.inl \ - CosLifeCycleS_T.inl \ CosLifeCycleC.cpp \ CosLifeCycleS.cpp \ CosLifeCycleC.h \ CosLifeCycleS.h \ - CosLifeCycleS_T.h + CosLifeCycleS_T.h \ + CosLifeCycleC.inl \ + CosLifeCycleS.inl \ + CosLifeCycleS_T.inl CLEANFILES += \ CosLifeCycleS_T.cpp \ - CosLifeCycleC.inl \ - CosLifeCycleS.inl \ - CosLifeCycleS_T.inl \ CosLifeCycleC.cpp \ CosLifeCycleS.cpp \ CosLifeCycleC.h \ CosLifeCycleS.h \ CosLifeCycleS_T.h \ - CosLifeCycle-stamp - -CosLifeCycleS_T.cpp CosLifeCycleC.inl CosLifeCycleS.inl CosLifeCycleS_T.inl CosLifeCycleC.cpp CosLifeCycleS.cpp CosLifeCycleC.h CosLifeCycleS.h CosLifeCycleS_T.h: CosLifeCycle-stamp + CosLifeCycleC.inl \ + CosLifeCycleS.inl \ + CosLifeCycleS_T.inl -CosLifeCycle-stamp: $(srcdir)/CosLifeCycle.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl - @touch $@ +CosLifeCycleS_T.cpp CosLifeCycleC.cpp CosLifeCycleS.cpp CosLifeCycleC.h CosLifeCycleS.h CosLifeCycleS_T.h CosLifeCycleC.inl CosLifeCycleS.inl CosLifeCycleS_T.inl: CosLifeCycle.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl BUILT_SOURCES += \ LifeCycleServiceS_T.cpp \ - LifeCycleServiceC.inl \ - LifeCycleServiceS.inl \ - LifeCycleServiceS_T.inl \ LifeCycleServiceC.cpp \ LifeCycleServiceS.cpp \ LifeCycleServiceC.h \ LifeCycleServiceS.h \ - LifeCycleServiceS_T.h + LifeCycleServiceS_T.h \ + LifeCycleServiceC.inl \ + LifeCycleServiceS.inl \ + LifeCycleServiceS_T.inl CLEANFILES += \ LifeCycleServiceS_T.cpp \ - LifeCycleServiceC.inl \ - LifeCycleServiceS.inl \ - LifeCycleServiceS_T.inl \ LifeCycleServiceC.cpp \ LifeCycleServiceS.cpp \ LifeCycleServiceC.h \ LifeCycleServiceS.h \ LifeCycleServiceS_T.h \ - LifeCycleService-stamp - -LifeCycleServiceS_T.cpp LifeCycleServiceC.inl LifeCycleServiceS.inl LifeCycleServiceS_T.inl LifeCycleServiceC.cpp LifeCycleServiceS.cpp LifeCycleServiceC.h LifeCycleServiceS.h LifeCycleServiceS_T.h: LifeCycleService-stamp + LifeCycleServiceC.inl \ + LifeCycleServiceS.inl \ + LifeCycleServiceS_T.inl -LifeCycleService-stamp: $(srcdir)/LifeCycleService.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl - @touch $@ +LifeCycleServiceS_T.cpp LifeCycleServiceC.cpp LifeCycleServiceS.cpp LifeCycleServiceC.h LifeCycleServiceS.h LifeCycleServiceS_T.h LifeCycleServiceC.inl LifeCycleServiceS.inl LifeCycleServiceS_T.inl: LifeCycleService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl LifeCycle = \ CosLifeCycleC.cpp \ @@ -935,8 +804,6 @@ libTAO_CosLifeCycle_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_LIFECYCLE_BUILD_DLL libTAO_CosLifeCycle_la_SOURCES = \ @@ -946,97 +813,84 @@ libTAO_CosLifeCycle_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosLifeCycle_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CosLifeCycleC.h \ - CosLifeCycleS.h \ - CosLifeCycleS_T.h \ - LifeCycleServiceC.h \ - LifeCycleServiceS.h \ + libTAO_CosNaming.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ LifeCycleServiceS_T.h \ - CosLifeCycleC.inl \ - CosLifeCycleS.inl \ - CosLifeCycleS_T.inl \ - LifeCycleServiceC.inl \ - LifeCycleServiceS.inl \ + Channel_Clients_T.h \ + CosLifeCycleS_T.h \ LifeCycleServiceS_T.inl \ + Channel_Clients_T.i \ + CosLifeCycleS_T.inl \ CosLifeCycleS_T.cpp \ LifeCycleServiceS_T.cpp \ - CosLifeCycle.idl \ - LifeCycleService.idl + Channel_Clients_T.cpp -EXTRA_DIST += \ - CosLifeCycle.rc ## Makefile.FTORB_Utils.am -if !BUILD_MINIMUM_CORBA +BUILT_SOURCES += \ + PortableGroup_Simple_DSS_T.cpp \ + PortableGroup_Simple_DSC.cpp \ + PortableGroup_Simple_DSC.h \ + PortableGroup_Simple_DSS.h \ + PortableGroup_Simple_DSS_T.h \ + PortableGroup_Simple_DSC.inl \ + PortableGroup_Simple_DSS.inl \ + PortableGroup_Simple_DSS_T.inl + +CLEANFILES += \ + PortableGroup_Simple_DSS_T.cpp \ + PortableGroup_Simple_DSC.cpp \ + PortableGroup_Simple_DSC.h \ + PortableGroup_Simple_DSS.h \ + PortableGroup_Simple_DSS_T.h \ + PortableGroup_Simple_DSC.inl \ + PortableGroup_Simple_DSS.inl \ + PortableGroup_Simple_DSS_T.inl + +PortableGroup_Simple_DSS_T.cpp PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSS.h PortableGroup_Simple_DSS_T.h PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl PortableGroup_Simple_DSS_T.inl: PortableGroup_Simple_DS.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/PortableGroup_Simple_DS.idl BUILT_SOURCES += \ FT_CORBA_ORBS_T.cpp \ - FT_CORBA_ORBC.inl \ - FT_CORBA_ORBS.inl \ - FT_CORBA_ORBS_T.inl \ FT_CORBA_ORBC.cpp \ FT_CORBA_ORBS.cpp \ FT_CORBA_ORBC.h \ FT_CORBA_ORBS.h \ - FT_CORBA_ORBS_T.h + FT_CORBA_ORBS_T.h \ + FT_CORBA_ORBC.inl \ + FT_CORBA_ORBS.inl \ + FT_CORBA_ORBS_T.inl CLEANFILES += \ FT_CORBA_ORBS_T.cpp \ - FT_CORBA_ORBC.inl \ - FT_CORBA_ORBS.inl \ - FT_CORBA_ORBS_T.inl \ FT_CORBA_ORBC.cpp \ FT_CORBA_ORBS.cpp \ FT_CORBA_ORBC.h \ FT_CORBA_ORBS.h \ FT_CORBA_ORBS_T.h \ - FT_CORBA_ORB-stamp - -FT_CORBA_ORBS_T.cpp FT_CORBA_ORBC.inl FT_CORBA_ORBS.inl FT_CORBA_ORBS_T.inl FT_CORBA_ORBC.cpp FT_CORBA_ORBS.cpp FT_CORBA_ORBC.h FT_CORBA_ORBS.h FT_CORBA_ORBS_T.h: FT_CORBA_ORB-stamp - -FT_CORBA_ORB-stamp: $(srcdir)/FT_CORBA_ORB.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl - @touch $@ - -BUILT_SOURCES += \ - PortableGroup_Simple_DSS_T.cpp \ - PortableGroup_Simple_DSC.inl \ - PortableGroup_Simple_DSS.inl \ - PortableGroup_Simple_DSS_T.inl \ - PortableGroup_Simple_DSC.cpp \ - PortableGroup_Simple_DSC.h \ - PortableGroup_Simple_DSS.h \ - PortableGroup_Simple_DSS_T.h - -CLEANFILES += \ - PortableGroup_Simple_DSS_T.cpp \ - PortableGroup_Simple_DSC.inl \ - PortableGroup_Simple_DSS.inl \ - PortableGroup_Simple_DSS_T.inl \ - PortableGroup_Simple_DSC.cpp \ - PortableGroup_Simple_DSC.h \ - PortableGroup_Simple_DSS.h \ - PortableGroup_Simple_DSS_T.h \ - PortableGroup_Simple_DS-stamp - -PortableGroup_Simple_DSS_T.cpp PortableGroup_Simple_DSC.inl PortableGroup_Simple_DSS.inl PortableGroup_Simple_DSS_T.inl PortableGroup_Simple_DSC.cpp PortableGroup_Simple_DSC.h PortableGroup_Simple_DSS.h PortableGroup_Simple_DSS_T.h: PortableGroup_Simple_DS-stamp + FT_CORBA_ORBC.inl \ + FT_CORBA_ORBS.inl \ + FT_CORBA_ORBS_T.inl -PortableGroup_Simple_DS-stamp: $(srcdir)/PortableGroup_Simple_DS.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/PortableGroup_Simple_DS.idl - @touch $@ +FT_CORBA_ORBS_T.cpp FT_CORBA_ORBC.cpp FT_CORBA_ORBS.cpp FT_CORBA_ORBC.h FT_CORBA_ORBS.h FT_CORBA_ORBS_T.h FT_CORBA_ORBC.inl FT_CORBA_ORBS.inl FT_CORBA_ORBS_T.inl: FT_CORBA_ORB.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl FTORB_Utils = \ + PortableGroup_Simple_DSC.cpp \ FT_CORBA_ORBC.cpp \ FT_CORBA_ORBS.cpp \ - FaultTolerance/FT_IOGR_Property.cpp \ - PortableGroup_Simple_DSC.cpp + FaultTolerance/FT_IOGR_Property.cpp lib_LTLIBRARIES += libTAO_FTORB_Utils.la @@ -1045,8 +899,6 @@ libTAO_FTORB_Utils_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_FT_ORB_UTILS_BUILD_DLL libTAO_FTORB_Utils_la_SOURCES = \ @@ -1056,94 +908,90 @@ libTAO_FTORB_Utils_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FTORB_Utils_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - FT_CORBA_ORBC.h \ - FT_CORBA_ORBS.h \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_IORManip.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Channel_Clients_T.h \ + PortableGroup_Simple_DSS_T.h \ FT_CORBA_ORBS_T.h \ FaultTolerance/FT_IOGR_Property.h \ - PortableGroup_Simple_DSC.h \ - PortableGroup_Simple_DSS_T.h \ - FT_CORBA_ORBC.inl \ - FT_CORBA_ORBS.inl \ + FT_CORBA_ORBC.h \ + FT_CORBA_ORBS.h \ + Channel_Clients_T.i \ + PortableGroup_Simple_DSS_T.inl \ FT_CORBA_ORBS_T.inl \ FaultTolerance/FT_IOGR_Property.i \ - PortableGroup_Simple_DSC.inl \ - PortableGroup_Simple_DSS_T.inl \ - FT_CORBA_ORBS_T.cpp \ + FT_CORBA_ORBC.inl \ + FT_CORBA_ORBS.inl \ PortableGroup_Simple_DSS_T.cpp \ - FT_CORBA_ORB.idl \ - PortableGroup_Simple_DS.idl + FT_CORBA_ORBS_T.cpp \ + Channel_Clients_T.cpp -endif !BUILD_MINIMUM_CORBA ## Makefile.PortableGroup.am -if !BUILD_MINIMUM_CORBA +BUILT_SOURCES += \ + miopS_T.cpp \ + miopC.cpp \ + miopS.cpp \ + miopC.h \ + miopS.h \ + miopS_T.h \ + miopC.inl \ + miopS.inl \ + miopS_T.inl + +CLEANFILES += \ + miopS_T.cpp \ + miopC.cpp \ + miopS.cpp \ + miopC.h \ + miopS.h \ + miopS_T.h \ + miopC.inl \ + miopS.inl \ + miopS_T.inl + +miopS_T.cpp miopC.cpp miopS.cpp miopC.h miopS.h miopS_T.h miopC.inl miopS.inl miopS_T.inl: miop.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h $(srcdir)/miop.idl BUILT_SOURCES += \ PortableGroupS_T.cpp \ - PortableGroupC.inl \ - PortableGroupS.inl \ - PortableGroupS_T.inl \ PortableGroupC.cpp \ PortableGroupS.cpp \ PortableGroupC.h \ PortableGroupS.h \ - PortableGroupS_T.h + PortableGroupS_T.h \ + PortableGroupC.inl \ + PortableGroupS.inl \ + PortableGroupS_T.inl CLEANFILES += \ PortableGroupS_T.cpp \ - PortableGroupC.inl \ - PortableGroupS.inl \ - PortableGroupS_T.inl \ PortableGroupC.cpp \ PortableGroupS.cpp \ PortableGroupC.h \ PortableGroupS.h \ PortableGroupS_T.h \ - PortableGroup-stamp - -PortableGroupS_T.cpp PortableGroupC.inl PortableGroupS.inl PortableGroupS_T.inl PortableGroupC.cpp PortableGroupS.cpp PortableGroupC.h PortableGroupS.h PortableGroupS_T.h: PortableGroup-stamp - -PortableGroup-stamp: $(srcdir)/PortableGroup.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl - @touch $@ + PortableGroupC.inl \ + PortableGroupS.inl \ + PortableGroupS_T.inl -BUILT_SOURCES += \ - miopS_T.cpp \ - miopC.inl \ - miopS.inl \ - miopS_T.inl \ - miopC.cpp \ - miopS.cpp \ - miopC.h \ - miopS.h \ - miopS_T.h +PortableGroupS_T.cpp PortableGroupC.cpp PortableGroupS.cpp PortableGroupC.h PortableGroupS.h PortableGroupS_T.h PortableGroupC.inl PortableGroupS.inl PortableGroupS_T.inl: PortableGroup.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl -CLEANFILES += \ - miopS_T.cpp \ - miopC.inl \ - miopS.inl \ - miopS_T.inl \ +PortableGroup = \ miopC.cpp \ miopS.cpp \ - miopC.h \ - miopS.h \ - miopS_T.h \ - miop-stamp - -miopS_T.cpp miopC.inl miopS.inl miopS_T.inl miopC.cpp miopS.cpp miopC.h miopS.h miopS_T.h: miop-stamp - -miop-stamp: $(srcdir)/miop.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl - @touch $@ - -PortableGroup = \ + PortableGroupC.cpp \ + PortableGroupS.cpp \ + PortableGroup_Simple_DSC.cpp \ PortableGroup/PG_Default_Property_Validator.cpp \ PortableGroup/PG_FactoryRegistry.cpp \ PortableGroup/PG_Factory_Map.cpp \ @@ -1151,15 +999,15 @@ PortableGroup = \ PortableGroup/PG_GenericFactory.cpp \ PortableGroup/PG_Group_Factory.cpp \ PortableGroup/PG_Group_Guard.cpp \ + PortableGroup/PG_Null_Property_Validator.cpp \ PortableGroup/PG_Location_Equal_To.cpp \ PortableGroup/PG_Location_Hash.cpp \ PortableGroup/PG_Location_Map.cpp \ PortableGroup/PG_MemberInfo.cpp \ - PortableGroup/PG_Null_Property_Validator.cpp \ + PortableGroup/PG_Object_Group_Manipulator.cpp \ PortableGroup/PG_ObjectGroupManager.cpp \ PortableGroup/PG_ObjectGroup_Map.cpp \ PortableGroup/PG_Object_Group.cpp \ - PortableGroup/PG_Object_Group_Manipulator.cpp \ PortableGroup/PG_Operators.cpp \ PortableGroup/PG_Properties_Encoder.cpp \ PortableGroup/PG_Properties_Support.cpp \ @@ -1168,10 +1016,11 @@ PortableGroup = \ PortableGroup/PG_Property_Utils.cpp \ PortableGroup/PG_Utils.cpp \ PortableGroup/POA_Hooks.cpp \ - PortableGroup/PortableGroup_Acceptor_Registry.cpp \ PortableGroup/PortableGroup_Loader.cpp \ + PortableGroup/PortableGroup_Acceptor_Registry.cpp \ PortableGroup/PortableGroup_ORBInitializer.cpp \ PortableGroup/PortableGroup_Request_Dispatcher.cpp \ + PortableGroup/UIPMC_Transport.cpp \ PortableGroup/Portable_Group_Map.cpp \ PortableGroup/UIPMC_Acceptor.cpp \ PortableGroup/UIPMC_Connection_Handler.cpp \ @@ -1180,13 +1029,7 @@ PortableGroup = \ PortableGroup/UIPMC_Factory.cpp \ PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp \ PortableGroup/UIPMC_Profile.cpp \ - PortableGroup/UIPMC_Transport.cpp \ - PortableGroup/UIPMC_Wait_Never.cpp \ - PortableGroupC.cpp \ - PortableGroupS.cpp \ - PortableGroup_Simple_DSC.cpp \ - miopC.cpp \ - miopS.cpp + PortableGroup/UIPMC_Wait_Never.cpp lib_LTLIBRARIES += libTAO_PortableGroup.la @@ -1195,8 +1038,6 @@ libTAO_PortableGroup_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_PORTABLEGROUP_BUILD_DLL libTAO_PortableGroup_la_SOURCES = \ @@ -1206,174 +1047,161 @@ libTAO_PortableGroup_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_PortableGroup_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - PortableGroup/PG_Default_Property_Validator.h \ - PortableGroup/PG_FactoryRegistry.h \ + $(top_builddir)/tao/libTAO_IORManip.la \ + libTAO_CosNaming.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ PortableGroup/PG_Factory_Map.h \ - PortableGroup/PG_Factory_Set.h \ - PortableGroup/PG_GenericFactory.h \ + PortableGroup/PG_Location_Map.h \ PortableGroup/PG_Group_Factory.h \ - PortableGroup/PG_Group_Guard.h \ - PortableGroup/PG_Location_Equal_To.h \ + PortableGroup/PG_PropertyManager.h \ + PortableGroup/PG_Null_Property_Validator.h \ + PortableGroupC.h \ + PortableGroupS.h \ + miopC.h \ + PortableGroup/PG_Object_Group.h \ + PortableGroup/UIPMC_Acceptor.h \ + PortableGroup/PortableGroup_ORBInitializer.h \ + miopS.h \ + PortableGroup/UIPMC_Endpoint.h \ + PortableGroup/PG_Factory_Set.h \ + PortableGroup/PG_Operators.h \ PortableGroup/PG_Location_Hash.h \ - PortableGroup/PG_Location_Map.h \ + PortableGroup/PG_Group_Guard.h \ + PortableGroup/UIPMC_Transport.h \ + PortableGroup/PG_Utils.h \ PortableGroup/PG_MemberInfo.h \ - PortableGroup/PG_Null_Property_Validator.h \ + PortableGroup/Portable_Group_Map.h \ + PortableGroup/PG_Properties_Support.h \ + PortableGroup/UIPMC_Wait_Never.h \ PortableGroup/PG_ObjectGroupManager.h \ + PortableGroup/POA_Hooks.h \ + PortableGroup/PG_FactoryRegistry.h \ + PortableGroup/PG_GenericFactory.h \ + PortableGroup/UIPMC_Factory.h \ PortableGroup/PG_ObjectGroup_Map.h \ - PortableGroup/PG_Object_Group.h \ - PortableGroup/PG_Object_Group_Manipulator.h \ - PortableGroup/PG_Operators.h \ + PortableGroup/PG_Default_Property_Validator.h \ + PortableGroup/UIPMC_Profile.h \ PortableGroup/PG_Properties_Encoder.h \ - PortableGroup/PG_Properties_Support.h \ - PortableGroup/PG_PropertyManager.h \ + PortableGroup/UIPMC_Message_Block_Data_Iterator.h \ + PortableGroup/UIPMC_Connection_Handler.h \ PortableGroup/PG_Property_Set.h \ - PortableGroup/PG_Property_Utils.h \ - PortableGroup/PG_Utils.h \ - PortableGroup/POA_Hooks.h \ - PortableGroup/PortableGroup_Acceptor_Registry.h \ PortableGroup/PortableGroup_Loader.h \ - PortableGroup/PortableGroup_ORBInitializer.h \ - PortableGroup/PortableGroup_Request_Dispatcher.h \ - PortableGroup/Portable_Group_Map.h \ - PortableGroup/UIPMC_Acceptor.h \ - PortableGroup/UIPMC_Connection_Handler.h \ + PortableGroup/PG_Object_Group_Manipulator.h \ PortableGroup/UIPMC_Connector.h \ - PortableGroup/UIPMC_Endpoint.h \ - PortableGroup/UIPMC_Factory.h \ - PortableGroup/UIPMC_Message_Block_Data_Iterator.h \ - PortableGroup/UIPMC_Profile.h \ - PortableGroup/UIPMC_Transport.h \ - PortableGroup/UIPMC_Wait_Never.h \ - PortableGroupC.h \ - PortableGroupS.h \ + PortableGroup/PortableGroup_Request_Dispatcher.h \ + PortableGroup/PG_Location_Equal_To.h \ + PortableGroup/PG_Property_Utils.h \ + PortableGroup/PortableGroup_Acceptor_Registry.h \ PortableGroupS_T.h \ - miopC.h \ - miopS.h \ miopS_T.h \ - PortableGroup/PG_Location_Equal_To.inl \ - PortableGroup/PG_Location_Hash.inl \ - PortableGroup/PG_Properties_Encoder.inl \ + Channel_Clients_T.h \ PortableGroup/UIPMC_Acceptor.i \ - PortableGroup/UIPMC_Connection_Handler.i \ + miopS.inl \ PortableGroup/UIPMC_Endpoint.i \ - PortableGroup/UIPMC_Profile.i \ + PortableGroup/PG_Location_Hash.inl \ PortableGroup/UIPMC_Transport.i \ - PortableGroupC.inl \ - PortableGroupS.inl \ + PortableGroup/UIPMC_Profile.i \ + PortableGroup/PG_Properties_Encoder.inl \ + PortableGroup/UIPMC_Connection_Handler.i \ + PortableGroup/PG_Location_Equal_To.inl \ PortableGroupS_T.inl \ - miopC.inl \ - miopS.inl \ miopS_T.inl \ - PortableGroupS_T.cpp \ + Channel_Clients_T.i \ miopS_T.cpp \ - PortableGroup.idl \ - miop.idl - -endif !BUILD_MINIMUM_CORBA + PortableGroupS_T.cpp \ + Channel_Clients_T.cpp -EXTRA_DIST += \ - PortableGroup.rc ## Makefile.CosLoadBalancing.am -if BUILD_AMI -if !BUILD_MINIMUM_CORBA - BUILT_SOURCES += \ CosLoadBalancingS_T.cpp \ - CosLoadBalancingC.inl \ - CosLoadBalancingS.inl \ - CosLoadBalancingS_T.inl \ CosLoadBalancingC.cpp \ CosLoadBalancingS.cpp \ CosLoadBalancingC.h \ CosLoadBalancingS.h \ - CosLoadBalancingS_T.h + CosLoadBalancingS_T.h \ + CosLoadBalancingC.inl \ + CosLoadBalancingS.inl \ + CosLoadBalancingS_T.inl CLEANFILES += \ CosLoadBalancingS_T.cpp \ - CosLoadBalancingC.inl \ - CosLoadBalancingS.inl \ - CosLoadBalancingS_T.inl \ CosLoadBalancingC.cpp \ CosLoadBalancingS.cpp \ CosLoadBalancingC.h \ CosLoadBalancingS.h \ CosLoadBalancingS_T.h \ - CosLoadBalancing-stamp - -CosLoadBalancingS_T.cpp CosLoadBalancingC.inl CosLoadBalancingS.inl CosLoadBalancingS_T.inl CosLoadBalancingC.cpp CosLoadBalancingS.cpp CosLoadBalancingC.h CosLoadBalancingS.h CosLoadBalancingS_T.h: CosLoadBalancing-stamp + CosLoadBalancingC.inl \ + CosLoadBalancingS.inl \ + CosLoadBalancingS_T.inl -CosLoadBalancing-stamp: $(srcdir)/CosLoadBalancing.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl - @touch $@ +CosLoadBalancingS_T.cpp CosLoadBalancingC.cpp CosLoadBalancingS.cpp CosLoadBalancingC.h CosLoadBalancingS.h CosLoadBalancingS_T.h CosLoadBalancingC.inl CosLoadBalancingS.inl CosLoadBalancingS_T.inl: CosLoadBalancing.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl BUILT_SOURCES += \ LB_ORTS_T.cpp \ - LB_ORTC.inl \ - LB_ORTS.inl \ - LB_ORTS_T.inl \ LB_ORTC.cpp \ LB_ORTC.h \ LB_ORTS.h \ - LB_ORTS_T.h + LB_ORTS_T.h \ + LB_ORTC.inl \ + LB_ORTS.inl \ + LB_ORTS_T.inl CLEANFILES += \ LB_ORTS_T.cpp \ - LB_ORTC.inl \ - LB_ORTS.inl \ - LB_ORTS_T.inl \ LB_ORTC.cpp \ LB_ORTC.h \ LB_ORTS.h \ LB_ORTS_T.h \ - LB_ORT-stamp - -LB_ORTS_T.cpp LB_ORTC.inl LB_ORTS.inl LB_ORTS_T.inl LB_ORTC.cpp LB_ORTC.h LB_ORTS.h LB_ORTS_T.h: LB_ORT-stamp + LB_ORTC.inl \ + LB_ORTS.inl \ + LB_ORTS_T.inl -LB_ORT-stamp: $(srcdir)/LB_ORT.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl - @touch $@ +LB_ORTS_T.cpp LB_ORTC.cpp LB_ORTC.h LB_ORTS.h LB_ORTS_T.h LB_ORTC.inl LB_ORTS.inl LB_ORTS_T.inl: LB_ORT.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl CosLoadBalancing = \ CosLoadBalancingC.cpp \ CosLoadBalancingS.cpp \ LB_ORTC.cpp \ - LoadBalancing/LB_CPU_Load_Average_Monitor.cpp \ - LoadBalancing/LB_CPU_Utilization_Monitor.cpp \ - LoadBalancing/LB_ClientComponent.cpp \ - LoadBalancing/LB_ClientORBInitializer.cpp \ - LoadBalancing/LB_ClientRequestInterceptor.cpp \ - LoadBalancing/LB_Component.cpp \ - LoadBalancing/LB_IORInterceptor.cpp \ LoadBalancing/LB_LeastLoaded.cpp \ + LoadBalancing/LB_LoadMinimum.cpp \ + LoadBalancing/LB_LoadAverage.cpp \ LoadBalancing/LB_LoadAlert.cpp \ LoadBalancing/LB_LoadAlertInfo.cpp \ LoadBalancing/LB_LoadAlertMap.cpp \ LoadBalancing/LB_LoadAlert_Handler.cpp \ - LoadBalancing/LB_LoadAverage.cpp \ LoadBalancing/LB_LoadListMap.cpp \ LoadBalancing/LB_LoadManager.cpp \ LoadBalancing/LB_LoadMap.cpp \ - LoadBalancing/LB_LoadMinimum.cpp \ LoadBalancing/LB_Location_Index_Map.cpp \ LoadBalancing/LB_MemberLocator.cpp \ LoadBalancing/LB_MonitorMap.cpp \ - LoadBalancing/LB_ORBInitializer.cpp \ - LoadBalancing/LB_ObjectReferenceFactory.cpp \ LoadBalancing/LB_Pull_Handler.cpp \ LoadBalancing/LB_Random.cpp \ LoadBalancing/LB_RoundRobin.cpp \ - LoadBalancing/LB_ServerRequestInterceptor.cpp + LoadBalancing/LB_ClientComponent.cpp \ + LoadBalancing/LB_ClientORBInitializer.cpp \ + LoadBalancing/LB_ClientRequestInterceptor.cpp \ + LoadBalancing/LB_ServerRequestInterceptor.cpp \ + LoadBalancing/LB_IORInterceptor.cpp \ + LoadBalancing/LB_ObjectReferenceFactory.cpp \ + LoadBalancing/LB_ORBInitializer.cpp \ + LoadBalancing/LB_Component.cpp \ + LoadBalancing/LB_CPU_Utilization_Monitor.cpp \ + LoadBalancing/LB_CPU_Load_Average_Monitor.cpp lib_LTLIBRARIES += libTAO_CosLoadBalancing.la @@ -1382,8 +1210,6 @@ libTAO_CosLoadBalancing_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_LOADBALANCING_BUILD_DLL libTAO_CosLoadBalancing_la_SOURCES = \ @@ -1393,484 +1219,322 @@ libTAO_CosLoadBalancing_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosLoadBalancing_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - libTAO_PortableGroup.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CosLoadBalancingC.h \ - CosLoadBalancingS.h \ - CosLoadBalancingS_T.h \ - LB_ORTC.h \ - LB_ORTS_T.h \ + libTAO_PortableGroup.la \ + $(top_builddir)/tao/libTAO_IORManip.la \ + libTAO_CosNaming.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + LoadBalancing/LB_ObjectReferenceFactory.h \ + LoadBalancing/LB_LoadAlertInfo.h \ + LoadBalancing/LB_LoadMap.h \ + LoadBalancing/LB_Component.h \ + LoadBalancing/LB_LoadAverage.h \ LoadBalancing/LB_CPU_Load_Average_Monitor.h \ - LoadBalancing/LB_CPU_Utilization_Monitor.h \ - LoadBalancing/LB_ClientComponent.h \ LoadBalancing/LB_ClientORBInitializer.h \ + LoadBalancing/LB_Pull_Handler.h \ LoadBalancing/LB_ClientRequestInterceptor.h \ - LoadBalancing/LB_Component.h \ - LoadBalancing/LB_IORInterceptor.h \ - LoadBalancing/LB_LeastLoaded.h \ - LoadBalancing/LB_LoadAlert.h \ - LoadBalancing/LB_LoadAlertInfo.h \ - LoadBalancing/LB_LoadAlertMap.h \ - LoadBalancing/LB_LoadAlert_Handler.h \ - LoadBalancing/LB_LoadAverage.h \ - LoadBalancing/LB_LoadListMap.h \ - LoadBalancing/LB_LoadManager.h \ - LoadBalancing/LB_LoadMap.h \ + LoadBalancing/LB_CPU_Utilization_Monitor.h \ + CosLoadBalancingC.h \ LoadBalancing/LB_LoadMinimum.h \ - LoadBalancing/LB_Location_Index_Map.h \ - LoadBalancing/LB_MemberLocator.h \ - LoadBalancing/LB_MonitorMap.h \ + CosLoadBalancingS.h \ + LoadBalancing/LB_RoundRobin.h \ LoadBalancing/LB_ORBInitializer.h \ - LoadBalancing/LB_ObjectReferenceFactory.h \ - LoadBalancing/LB_Pull_Handler.h \ + LoadBalancing/LB_MonitorMap.h \ + LoadBalancing/LB_LoadAlert_Handler.h \ + LoadBalancing/LB_LeastLoaded.h \ + LoadBalancing/LB_LoadManager.h \ LoadBalancing/LB_Random.h \ - LoadBalancing/LB_RoundRobin.h \ LoadBalancing/LB_ServerRequestInterceptor.h \ + LoadBalancing/LB_Location_Index_Map.h \ + LoadBalancing/LB_LoadAlertMap.h \ + LoadBalancing/LB_LoadAlert.h \ + LB_ORTC.h \ + LoadBalancing/LB_ClientComponent.h \ + LoadBalancing/LB_MemberLocator.h \ + LoadBalancing/LB_IORInterceptor.h \ + LoadBalancing/LB_LoadListMap.h \ + Channel_Clients_T.h \ + LB_ORTS_T.h \ + CosLoadBalancingS_T.h \ + LoadBalancing/LB_LoadAverage.inl \ CosLoadBalancingC.inl \ + LoadBalancing/LB_LoadMinimum.inl \ CosLoadBalancingS.inl \ - CosLoadBalancingS_T.inl \ - LB_ORTC.inl \ - LB_ORTS_T.inl \ LoadBalancing/LB_LeastLoaded.inl \ LoadBalancing/LB_LoadAlert.inl \ - LoadBalancing/LB_LoadAverage.inl \ - LoadBalancing/LB_LoadMinimum.inl \ + LB_ORTC.inl \ + Channel_Clients_T.i \ + LB_ORTS_T.inl \ + CosLoadBalancingS_T.inl \ CosLoadBalancingS_T.cpp \ LB_ORTS_T.cpp \ - CosLoadBalancing.idl \ - LB_ORT.idl + Channel_Clients_T.cpp -endif !BUILD_MINIMUM_CORBA -endif BUILD_AMI -EXTRA_DIST += \ - CosLoadBalancing.rc - -## Makefile.CosNaming_Skel.am +## Makefile.ETCL.am -lib_LTLIBRARIES += libTAO_CosNaming_Skel.la +lib_LTLIBRARIES += libTAO_ETCL.la -libTAO_CosNaming_Skel_la_CPPFLAGS = \ +libTAO_ETCL_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_NAMING_SKEL_BUILD_DLL + -DTAO_ETCL_BUILD_DLL -libTAO_CosNaming_Skel_la_SOURCES = \ - CosNamingS.cpp +libTAO_ETCL_la_SOURCES = \ + ETCL/ETCL_l.cpp \ + ETCL/ETCL_Constraint.cpp \ + ETCL/ETCL_Interpreter.cpp \ + ETCL/ETCL_y.cpp -libTAO_CosNaming_Skel_la_LDFLAGS = \ +libTAO_ETCL_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -libTAO_CosNaming_Skel_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CosNamingS.h \ - CosNamingS.inl - -EXTRA_DIST += \ - CosNaming_Skel.rc - -## Makefile.CosNaming_Serv.am +libTAO_ETCL_la_LIBADD = \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la -Naming = \ - Naming/Entries.cpp \ - Naming/Flat_File_Persistence.cpp \ - Naming/Hash_Naming_Context.cpp \ - Naming/Naming_Context_Interface.cpp \ - Naming/Naming_Loader.cpp \ - Naming/Naming_Server.cpp \ - Naming/Persistent_Context_Index.cpp \ - Naming/Persistent_Entries.cpp \ - Naming/Persistent_Naming_Context.cpp \ - Naming/Storable.cpp \ - Naming/Storable_Naming_Context.cpp \ - Naming/Storable_Naming_Context_Activator.cpp \ - Naming/Transient_Naming_Context.cpp +noinst_HEADERS += \ + ETCL/ETCL_Constraint.h \ + Channel_Clients_T.h \ + ETCL/ETCL_Interpreter.h \ + ETCL/ETCL_y.h \ + ETCL/ETCL_Constraint.i \ + Channel_Clients_T.i \ + Channel_Clients_T.cpp -lib_LTLIBRARIES += libTAO_CosNaming_Serv.la -libTAO_CosNaming_Serv_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_NAMING_SERV_BUILD_DLL +## Makefile.CosNotification.am -libTAO_CosNaming_Serv_la_SOURCES = \ - $(Naming) +BUILT_SOURCES += \ + CosEventCommS_T.cpp \ + CosEventCommC.cpp \ + CosEventCommS.cpp \ + CosEventCommC.h \ + CosEventCommS.h \ + CosEventCommS_T.h \ + CosEventCommC.inl \ + CosEventCommS.inl \ + CosEventCommS_T.inl -libTAO_CosNaming_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ +CLEANFILES += \ + CosEventCommS_T.cpp \ + CosEventCommC.cpp \ + CosEventCommS.cpp \ + CosEventCommC.h \ + CosEventCommS.h \ + CosEventCommS_T.h \ + CosEventCommC.inl \ + CosEventCommS.inl \ + CosEventCommS_T.inl -libTAO_CosNaming_Serv_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_CosNaming_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - Naming/Entries.h \ - Naming/Flat_File_Persistence.h \ - Naming/Hash_Naming_Context.h \ - Naming/Naming_Context_Interface.h \ - Naming/Naming_Loader.h \ - Naming/Naming_Server.h \ - Naming/Persistent_Context_Index.h \ - Naming/Persistent_Entries.h \ - Naming/Persistent_Naming_Context.h \ - Naming/Storable.h \ - Naming/Storable_Naming_Context.h \ - Naming/Storable_Naming_Context_Activator.h \ - Naming/Transient_Naming_Context.h \ - Naming/naming_export.h \ - Naming/Storable.inl +CosEventCommS_T.cpp CosEventCommC.cpp CosEventCommS.cpp CosEventCommC.h CosEventCommS.h CosEventCommS_T.h CosEventCommC.inl CosEventCommS.inl CosEventCommS_T.inl: CosEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosEventComm.idl -EXTRA_DIST += \ - CosNaming_Serv.rc +BUILT_SOURCES += \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminC.cpp \ + CosEventChannelAdminS.cpp \ + CosEventChannelAdminC.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminC.inl \ + CosEventChannelAdminS.inl \ + CosEventChannelAdminS_T.inl -## Makefile.CosNotification.am +CLEANFILES += \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminC.cpp \ + CosEventChannelAdminS.cpp \ + CosEventChannelAdminC.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminC.inl \ + CosEventChannelAdminS.inl \ + CosEventChannelAdminS_T.inl -if !BUILD_MINIMUM_CORBA +CosEventChannelAdminS_T.cpp CosEventChannelAdminC.cpp CosEventChannelAdminS.cpp CosEventChannelAdminC.h CosEventChannelAdminS.h CosEventChannelAdminS_T.h CosEventChannelAdminC.inl CosEventChannelAdminS.inl CosEventChannelAdminS_T.inl: CosEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosEventChannelAdmin.idl BUILT_SOURCES += \ CosNotificationS_T.cpp \ - CosNotificationC.inl \ - CosNotificationS_T.inl \ CosNotificationC.cpp \ + CosNotificationS.cpp \ CosNotificationC.h \ - CosNotificationS_T.h + CosNotificationS.h \ + CosNotificationS_T.h \ + CosNotificationC.inl \ + CosNotificationS.inl \ + CosNotificationS_T.inl CLEANFILES += \ CosNotificationS_T.cpp \ - CosNotificationC.inl \ - CosNotificationS_T.inl \ CosNotificationC.cpp \ + CosNotificationS.cpp \ CosNotificationC.h \ + CosNotificationS.h \ CosNotificationS_T.h \ - CosNotification-stamp - -CosNotificationS_T.cpp CosNotificationC.inl CosNotificationS_T.inl CosNotificationC.cpp CosNotificationC.h CosNotificationS_T.h: CosNotification-stamp - -CosNotification-stamp: $(srcdir)/CosNotification.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl - @touch $@ - -BUILT_SOURCES += \ - CosNotifyChannelAdminS_T.cpp \ - CosNotifyChannelAdminC.inl \ - CosNotifyChannelAdminS_T.inl \ - CosNotifyChannelAdminC.cpp \ - CosNotifyChannelAdminC.h \ - CosNotifyChannelAdminS_T.h - -CLEANFILES += \ - CosNotifyChannelAdminS_T.cpp \ - CosNotifyChannelAdminC.inl \ - CosNotifyChannelAdminS_T.inl \ - CosNotifyChannelAdminC.cpp \ - CosNotifyChannelAdminC.h \ - CosNotifyChannelAdminS_T.h \ - CosNotifyChannelAdmin-stamp - -CosNotifyChannelAdminS_T.cpp CosNotifyChannelAdminC.inl CosNotifyChannelAdminS_T.inl CosNotifyChannelAdminC.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminS_T.h: CosNotifyChannelAdmin-stamp + CosNotificationC.inl \ + CosNotificationS.inl \ + CosNotificationS_T.inl -CosNotifyChannelAdmin-stamp: $(srcdir)/CosNotifyChannelAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl - @touch $@ +CosNotificationS_T.cpp CosNotificationC.cpp CosNotificationS.cpp CosNotificationC.h CosNotificationS.h CosNotificationS_T.h CosNotificationC.inl CosNotificationS.inl CosNotificationS_T.inl: CosNotification.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosNotification.idl BUILT_SOURCES += \ CosNotifyCommS_T.cpp \ - CosNotifyCommC.inl \ - CosNotifyCommS_T.inl \ CosNotifyCommC.cpp \ + CosNotifyCommS.cpp \ CosNotifyCommC.h \ - CosNotifyCommS_T.h + CosNotifyCommS.h \ + CosNotifyCommS_T.h \ + CosNotifyCommC.inl \ + CosNotifyCommS.inl \ + CosNotifyCommS_T.inl CLEANFILES += \ CosNotifyCommS_T.cpp \ - CosNotifyCommC.inl \ - CosNotifyCommS_T.inl \ CosNotifyCommC.cpp \ + CosNotifyCommS.cpp \ CosNotifyCommC.h \ + CosNotifyCommS.h \ CosNotifyCommS_T.h \ - CosNotifyComm-stamp - -CosNotifyCommS_T.cpp CosNotifyCommC.inl CosNotifyCommS_T.inl CosNotifyCommC.cpp CosNotifyCommC.h CosNotifyCommS_T.h: CosNotifyComm-stamp + CosNotifyCommC.inl \ + CosNotifyCommS.inl \ + CosNotifyCommS_T.inl -CosNotifyComm-stamp: $(srcdir)/CosNotifyComm.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl - @touch $@ +CosNotifyCommS_T.cpp CosNotifyCommC.cpp CosNotifyCommS.cpp CosNotifyCommC.h CosNotifyCommS.h CosNotifyCommS_T.h CosNotifyCommC.inl CosNotifyCommS.inl CosNotifyCommS_T.inl: CosNotifyComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosNotifyComm.idl BUILT_SOURCES += \ CosNotifyFilterS_T.cpp \ - CosNotifyFilterC.inl \ - CosNotifyFilterS_T.inl \ CosNotifyFilterC.cpp \ + CosNotifyFilterS.cpp \ CosNotifyFilterC.h \ - CosNotifyFilterS_T.h + CosNotifyFilterS.h \ + CosNotifyFilterS_T.h \ + CosNotifyFilterC.inl \ + CosNotifyFilterS.inl \ + CosNotifyFilterS_T.inl CLEANFILES += \ CosNotifyFilterS_T.cpp \ - CosNotifyFilterC.inl \ - CosNotifyFilterS_T.inl \ CosNotifyFilterC.cpp \ + CosNotifyFilterS.cpp \ CosNotifyFilterC.h \ + CosNotifyFilterS.h \ CosNotifyFilterS_T.h \ - CosNotifyFilter-stamp - -CosNotifyFilterS_T.cpp CosNotifyFilterC.inl CosNotifyFilterS_T.inl CosNotifyFilterC.cpp CosNotifyFilterC.h CosNotifyFilterS_T.h: CosNotifyFilter-stamp + CosNotifyFilterC.inl \ + CosNotifyFilterS.inl \ + CosNotifyFilterS_T.inl -CosNotifyFilter-stamp: $(srcdir)/CosNotifyFilter.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl - @touch $@ +CosNotifyFilterS_T.cpp CosNotifyFilterC.cpp CosNotifyFilterS.cpp CosNotifyFilterC.h CosNotifyFilterS.h CosNotifyFilterS_T.h CosNotifyFilterC.inl CosNotifyFilterS.inl CosNotifyFilterS_T.inl: CosNotifyFilter.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosNotifyFilter.idl BUILT_SOURCES += \ - Event_ForwarderS_T.cpp \ - Event_ForwarderC.inl \ - Event_ForwarderS_T.inl \ - Event_ForwarderC.cpp \ - Event_ForwarderC.h \ - Event_ForwarderS_T.h + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminC.cpp \ + CosNotifyChannelAdminS.cpp \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminS.h \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminC.inl \ + CosNotifyChannelAdminS.inl \ + CosNotifyChannelAdminS_T.inl CLEANFILES += \ - Event_ForwarderS_T.cpp \ - Event_ForwarderC.inl \ - Event_ForwarderS_T.inl \ - Event_ForwarderC.cpp \ - Event_ForwarderC.h \ - Event_ForwarderS_T.h \ - Event_Forwarder-stamp - -Event_ForwarderS_T.cpp Event_ForwarderC.inl Event_ForwarderS_T.inl Event_ForwarderC.cpp Event_ForwarderC.h Event_ForwarderS_T.h: Event_Forwarder-stamp + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminC.cpp \ + CosNotifyChannelAdminS.cpp \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminS.h \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminC.inl \ + CosNotifyChannelAdminS.inl \ + CosNotifyChannelAdminS_T.inl -Event_Forwarder-stamp: $(srcdir)/Event_Forwarder.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl - @touch $@ +CosNotifyChannelAdminS_T.cpp CosNotifyChannelAdminC.cpp CosNotifyChannelAdminS.cpp CosNotifyChannelAdminC.h CosNotifyChannelAdminS.h CosNotifyChannelAdminS_T.h CosNotifyChannelAdminC.inl CosNotifyChannelAdminS.inl CosNotifyChannelAdminS_T.inl: CosNotifyChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/CosNotifyChannelAdmin.idl BUILT_SOURCES += \ NotifyExtS_T.cpp \ - NotifyExtC.inl \ - NotifyExtS_T.inl \ NotifyExtC.cpp \ + NotifyExtS.cpp \ NotifyExtC.h \ - NotifyExtS_T.h + NotifyExtS.h \ + NotifyExtS_T.h \ + NotifyExtC.inl \ + NotifyExtS.inl \ + NotifyExtS_T.inl CLEANFILES += \ NotifyExtS_T.cpp \ - NotifyExtC.inl \ - NotifyExtS_T.inl \ NotifyExtC.cpp \ + NotifyExtS.cpp \ NotifyExtC.h \ + NotifyExtS.h \ NotifyExtS_T.h \ - NotifyExt-stamp - -NotifyExtS_T.cpp NotifyExtC.inl NotifyExtS_T.inl NotifyExtC.cpp NotifyExtC.h NotifyExtS_T.h: NotifyExt-stamp - -NotifyExt-stamp: $(srcdir)/NotifyExt.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl - @touch $@ - -lib_LTLIBRARIES += libTAO_CosNotification.la + NotifyExtC.inl \ + NotifyExtS.inl \ + NotifyExtS_T.inl -libTAO_CosNotification_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DTAO_NOTIFY_BUILD_DLL +NotifyExtS_T.cpp NotifyExtC.cpp NotifyExtS.cpp NotifyExtC.h NotifyExtS.h NotifyExtS_T.h NotifyExtC.inl NotifyExtS.inl NotifyExtS_T.inl: NotifyExt.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/NotifyExt.idl -libTAO_CosNotification_la_SOURCES = \ - CosNotificationC.cpp \ - CosNotifyChannelAdminC.cpp \ - CosNotifyCommC.cpp \ - CosNotifyFilterC.cpp \ +BUILT_SOURCES += \ + Event_ForwarderS_T.cpp \ Event_ForwarderC.cpp \ - Notify/Notify_Extensions.cpp \ - NotifyExtC.cpp - -libTAO_CosNotification_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_CosNotification_la_LIBADD = \ - libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CosNotificationC.h \ - CosNotificationS_T.h \ - CosNotifyChannelAdminC.h \ - CosNotifyChannelAdminS_T.h \ - CosNotifyCommC.h \ - CosNotifyCommS_T.h \ - CosNotifyFilterC.h \ - CosNotifyFilterS_T.h \ + Event_ForwarderS.cpp \ Event_ForwarderC.h \ + Event_ForwarderS.h \ Event_ForwarderS_T.h \ - Notify/Notify_Extensions.h \ - NotifyExtC.h \ - NotifyExtS_T.h \ - CosNotificationC.inl \ - CosNotificationS_T.inl \ - CosNotifyChannelAdminC.inl \ - CosNotifyChannelAdminS_T.inl \ - CosNotifyCommC.inl \ - CosNotifyCommS_T.inl \ - CosNotifyFilterC.inl \ - CosNotifyFilterS_T.inl \ Event_ForwarderC.inl \ - Event_ForwarderS_T.inl \ - NotifyExtC.inl \ - NotifyExtS_T.inl \ - CosNotificationS_T.cpp \ - CosNotifyChannelAdminS_T.cpp \ - CosNotifyCommS_T.cpp \ - CosNotifyFilterS_T.cpp \ - Event_ForwarderS_T.cpp \ - NotifyExtS_T.cpp \ - CosNotification.idl \ - CosNotifyChannelAdmin.idl \ - CosNotifyComm.idl \ - CosNotifyFilter.idl \ - Event_Forwarder.idl \ - NotifyExt.idl - -endif !BUILD_MINIMUM_CORBA - -EXTRA_DIST += \ - CosNotification.rc - -## Makefile.ETCL.am - -lib_LTLIBRARIES += libTAO_ETCL.la - -libTAO_ETCL_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_ETCL_BUILD_DLL - -libTAO_ETCL_la_SOURCES = \ - ETCL/ETCL_Constraint.cpp \ - ETCL/ETCL_Interpreter.cpp \ - ETCL/ETCL_l.cpp \ - ETCL/ETCL_y.cpp - -libTAO_ETCL_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_ETCL_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - ETCL/ETCL_Constraint.h \ - ETCL/ETCL_Interpreter.h \ - ETCL/ETCL_y.h \ - ETCL/ETCL_Constraint.i - -EXTRA_DIST += \ - ETCL.rc - -## Makefile.CosNotification_Skel.am - -if !BUILD_MINIMUM_CORBA - -lib_LTLIBRARIES += libTAO_CosNotification_Skel.la - -libTAO_CosNotification_Skel_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DTAO_NOTIFY_SKEL_BUILD_DLL + Event_ForwarderS.inl \ + Event_ForwarderS_T.inl -libTAO_CosNotification_Skel_la_SOURCES = \ - CosNotificationS.cpp \ - CosNotifyChannelAdminS.cpp \ - CosNotifyCommS.cpp \ - CosNotifyFilterS.cpp \ +CLEANFILES += \ + Event_ForwarderS_T.cpp \ + Event_ForwarderC.cpp \ Event_ForwarderS.cpp \ - NotifyExtS.cpp - -libTAO_CosNotification_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_CosNotification_Skel_la_LIBADD = \ - libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosNotification.la \ - libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CosNotificationS.h \ - CosNotifyChannelAdminS.h \ - CosNotifyCommS.h \ - CosNotifyFilterS.h \ + Event_ForwarderC.h \ Event_ForwarderS.h \ - NotifyExtS.h \ - CosNotificationS.inl \ - CosNotifyChannelAdminS.inl \ - CosNotifyCommS.inl \ - CosNotifyFilterS.inl \ + Event_ForwarderS_T.h \ + Event_ForwarderC.inl \ Event_ForwarderS.inl \ - NotifyExtS.inl - -endif !BUILD_MINIMUM_CORBA - -EXTRA_DIST += \ - CosNotification_Skel.rc + Event_ForwarderS_T.inl -## Makefile.CosNotification_Serv.am - -if !BUILD_MINIMUM_CORBA +Event_ForwarderS_T.cpp Event_ForwarderC.cpp Event_ForwarderS.cpp Event_ForwarderC.h Event_ForwarderS.h Event_ForwarderS_T.h Event_ForwarderC.inl Event_ForwarderS.inl Event_ForwarderS_T.inl: Event_Forwarder.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h $(srcdir)/Event_Forwarder.idl Notify = \ + CosEventCommC.cpp \ + CosEventCommS.cpp \ + CosEventChannelAdminC.cpp \ + CosEventChannelAdminS.cpp \ + CosNotificationC.cpp \ + CosNotificationS.cpp \ + CosNotifyCommC.cpp \ + CosNotifyCommS.cpp \ + CosNotifyFilterC.cpp \ + CosNotifyFilterS.cpp \ + CosNotifyChannelAdminC.cpp \ + CosNotifyChannelAdminS.cpp \ + NotifyExtC.cpp \ + NotifyExtS.cpp \ + Event_ForwarderC.cpp \ + Event_ForwarderS.cpp \ Notify/Admin.cpp \ Notify/AdminProperties.cpp \ - Notify/Any/AnyEvent.cpp \ - Notify/Any/CosEC_ProxyPushConsumer.cpp \ - Notify/Any/CosEC_ProxyPushSupplier.cpp \ - Notify/Any/ProxyPushConsumer.cpp \ - Notify/Any/ProxyPushSupplier.cpp \ - Notify/Any/PushConsumer.cpp \ - Notify/Any/PushSupplier.cpp \ Notify/Buffering_Strategy.cpp \ Notify/Builder.cpp \ Notify/Consumer.cpp \ @@ -1896,14 +1560,15 @@ Notify = \ Notify/Method_Request_Updates.cpp \ Notify/Notify_Constraint_Interpreter.cpp \ Notify/Notify_Constraint_Visitors.cpp \ - Notify/Notify_Default_CO_Factory.cpp \ Notify/Notify_Default_Collection_Factory.cpp \ + Notify/Notify_Default_CO_Factory.cpp \ Notify/Notify_Default_EMO_Factory.cpp \ Notify/Notify_Default_POA_Factory.cpp \ Notify/Notify_EventChannelFactory_i.cpp \ + Notify/Notify_Extensions.cpp \ Notify/Object.cpp \ - Notify/POA_Helper.cpp \ Notify/Peer.cpp \ + Notify/POA_Helper.cpp \ Notify/Properties.cpp \ Notify/PropertySeq.cpp \ Notify/Property_Boolean.cpp \ @@ -1913,6 +1578,20 @@ Notify = \ Notify/QoSProperties.cpp \ Notify/Reactive_Task.cpp \ Notify/Refcountable.cpp \ + Notify/Subscription_Change_Worker.cpp \ + Notify/Supplier.cpp \ + Notify/SupplierAdmin.cpp \ + Notify/ThreadPool_Task.cpp \ + Notify/Timer_Queue.cpp \ + Notify/Timer_Reactor.cpp \ + Notify/Worker_Task.cpp \ + Notify/Any/AnyEvent.cpp \ + Notify/Any/CosEC_ProxyPushConsumer.cpp \ + Notify/Any/CosEC_ProxyPushSupplier.cpp \ + Notify/Any/ProxyPushConsumer.cpp \ + Notify/Any/ProxyPushSupplier.cpp \ + Notify/Any/PushConsumer.cpp \ + Notify/Any/PushSupplier.cpp \ Notify/Sequence/Batch_Buffering_Strategy.cpp \ Notify/Sequence/SequenceProxyPushConsumer.cpp \ Notify/Sequence/SequenceProxyPushSupplier.cpp \ @@ -1922,218 +1601,260 @@ Notify = \ Notify/Structured/StructuredProxyPushConsumer.cpp \ Notify/Structured/StructuredProxyPushSupplier.cpp \ Notify/Structured/StructuredPushConsumer.cpp \ - Notify/Structured/StructuredPushSupplier.cpp \ - Notify/Subscription_Change_Worker.cpp \ - Notify/Supplier.cpp \ - Notify/SupplierAdmin.cpp \ - Notify/ThreadPool_Task.cpp \ - Notify/Timer_Queue.cpp \ - Notify/Timer_Reactor.cpp \ - Notify/Worker_Task.cpp + Notify/Structured/StructuredPushSupplier.cpp -lib_LTLIBRARIES += libTAO_CosNotification_Serv.la +lib_LTLIBRARIES += libTAO_CosNotification.la -libTAO_CosNotification_Serv_la_CPPFLAGS = \ +libTAO_CosNotification_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DTAO_NOTIFY_SERV_BUILD_DLL + -DTAO_NOTIFY_BUILD_DLL -DTAO_EVENT_BUILD_DLL -libTAO_CosNotification_Serv_la_SOURCES = \ +libTAO_CosNotification_la_SOURCES = \ $(Notify) -libTAO_CosNotification_Serv_la_LDFLAGS = \ +libTAO_CosNotification_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -libTAO_CosNotification_Serv_la_LIBADD = \ - libTAO_ETCL.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - libTAO_CosNotification_Skel.la \ - libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosNotification.la \ - libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ +libTAO_CosNotification_la_LIBADD = \ + $(top_builddir)/tao/libTAO_DynamicAny.la \ + libTAO_ETCL.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Notify/Notify_Default_POA_Factory.h \ + Notify/Default_Factory.h \ + Notify/CosNotify_Service.h \ + Notify/Notify_Default_EMO_Factory.h \ + Notify/Any/PushSupplier.h \ + Notify/Any/PushConsumer.h \ + Notify/Reactive_Task.h \ + Notify/Method_Request.h \ + CosNotifyCommC.h \ Notify/Admin.h \ + Notify/ThreadPool_Task.h \ + Notify/Timer_Reactor.h \ + Notify/Notify_Default_CO_Factory.h \ + Notify/Notify_Constraint_Visitors.h \ + Notify/Notify_Extensions.h \ + Notify/Properties.h \ + CosNotifyCommS.h \ + Notify/Structured/StructuredProxyPushSupplier.h \ + Notify/Structured/StructuredProxyPushConsumer.h \ Notify/AdminProperties.h \ - Notify/Any/AnyEvent.h \ - Notify/Any/CosEC_ProxyPushConsumer.h \ - Notify/Any/CosEC_ProxyPushSupplier.h \ - Notify/Any/ProxyPushConsumer.h \ + Notify/EventChannelFactory.h \ + Notify/ConsumerAdmin.h \ Notify/Any/ProxyPushSupplier.h \ - Notify/Any/PushConsumer.h \ - Notify/Any/PushSupplier.h \ - Notify/Buffering_Strategy.h \ + Notify/Any/ProxyPushConsumer.h \ Notify/Builder.h \ + Notify/Subscription_Change_Worker.h \ + CosEventChannelAdminC.h \ + Notify/Refcountable.h \ + Notify/Notify_EventChannelFactory_i.h \ + CosEventChannelAdminS.h \ + Notify/ProxySupplier.h \ + Notify/Supplier.h \ + Notify/ProxyConsumer.h \ Notify/Consumer.h \ - Notify/ConsumerAdmin.h \ - Notify/CosNotify_Initializer.h \ - Notify/CosNotify_Service.h \ - Notify/Default_Factory.h \ - Notify/ETCL_Filter.h \ - Notify/ETCL_FilterFactory.h \ + Notify/Sequence/Batch_Buffering_Strategy.h \ Notify/Event.h \ - Notify/EventChannel.h \ - Notify/EventChannelFactory.h \ + CosEventCommC.h \ + Notify/Worker_Task.h \ Notify/EventType.h \ Notify/EventTypeSeq.h \ - Notify/Event_Manager.h \ - Notify/FilterAdmin.h \ - Notify/ID_Factory.h \ - Notify/Method_Request.h \ - Notify/Method_Request_Dispatch.h \ - Notify/Method_Request_Event.h \ - Notify/Method_Request_Lookup.h \ - Notify/Method_Request_Shutdown.h \ - Notify/Method_Request_Updates.h \ - Notify/Notify_Constraint_Interpreter.h \ - Notify/Notify_Constraint_Visitors.h \ - Notify/Notify_Default_CO_Factory.h \ - Notify/Notify_Default_Collection_Factory.h \ - Notify/Notify_Default_EMO_Factory.h \ - Notify/Notify_Default_POA_Factory.h \ - Notify/Notify_EventChannelFactory_i.h \ - Notify/Object.h \ - Notify/POA_Helper.h \ - Notify/Peer.h \ - Notify/Properties.h \ - Notify/PropertySeq.h \ - Notify/Property_Boolean.h \ + CosEventCommS.h \ Notify/Proxy.h \ - Notify/ProxyConsumer.h \ - Notify/ProxySupplier.h \ + Notify/Any/CosEC_ProxyPushSupplier.h \ + Notify/Notify_Default_Collection_Factory.h \ + Notify/Any/CosEC_ProxyPushConsumer.h \ + Notify/SupplierAdmin.h \ + Notify/Buffering_Strategy.h \ Notify/QoSProperties.h \ - Notify/Reactive_Task.h \ - Notify/Refcountable.h \ - Notify/Sequence/Batch_Buffering_Strategy.h \ - Notify/Sequence/SequenceProxyPushConsumer.h \ - Notify/Sequence/SequenceProxyPushSupplier.h \ - Notify/Sequence/SequencePushConsumer.h \ + Notify/Method_Request_Event.h \ + CosNotifyFilterC.h \ Notify/Sequence/SequencePushSupplier.h \ + CosNotifyFilterS.h \ + Notify/Sequence/SequencePushConsumer.h \ + Notify/Method_Request_Dispatch.h \ + Notify/POA_Helper.h \ Notify/Structured/StructuredEvent.h \ - Notify/Structured/StructuredProxyPushConsumer.h \ - Notify/Structured/StructuredProxyPushSupplier.h \ - Notify/Structured/StructuredPushConsumer.h \ + Notify/PropertySeq.h \ + Notify/Notify_Constraint_Interpreter.h \ + Event_ForwarderC.h \ + CosNotifyChannelAdminC.h \ + Event_ForwarderS.h \ + Notify/FilterAdmin.h \ + CosNotificationC.h \ + Notify/Method_Request_Shutdown.h \ + CosNotifyChannelAdminS.h \ + Notify/Peer.h \ + Notify/Any/AnyEvent.h \ + Notify/CosNotify_Initializer.h \ + CosNotificationS.h \ Notify/Structured/StructuredPushSupplier.h \ - Notify/Subscription_Change_Worker.h \ - Notify/Supplier.h \ - Notify/SupplierAdmin.h \ - Notify/ThreadPool_Task.h \ + Notify/Structured/StructuredPushConsumer.h \ + Notify/Object.h \ + NotifyExtC.h \ + Notify/ID_Factory.h \ + NotifyExtS.h \ + Notify/Event_Manager.h \ + Notify/ETCL_FilterFactory.h \ + Notify/Property_Boolean.h \ + Notify/Sequence/SequenceProxyPushSupplier.h \ + Notify/Sequence/SequenceProxyPushConsumer.h \ + Notify/EventChannel.h \ + Notify/Method_Request_Updates.h \ + Notify/ETCL_Filter.h \ Notify/Timer_Queue.h \ - Notify/Timer_Reactor.h \ - Notify/Worker_Task.h \ + Notify/Method_Request_Lookup.h \ + Event_ForwarderS_T.h \ + CosNotifyFilterS_T.h \ + NotifyExtS_T.h \ + CosEventChannelAdminS_T.h \ + Channel_Clients_T.h \ + CosNotifyCommS_T.h \ + CosNotificationS_T.h \ + CosNotifyChannelAdminS_T.h \ + CosEventCommS_T.h \ + Notify/Default_Factory.inl \ + Notify/CosNotify_Service.inl \ + Notify/Any/PushSupplier.inl \ + Notify/Any/PushConsumer.inl \ + Notify/Reactive_Task.inl \ + Notify/Method_Request.inl \ + CosNotifyCommC.inl \ Notify/Admin.inl \ + Notify/ThreadPool_Task.inl \ + Notify/Timer_Reactor.inl \ + Notify/Properties.inl \ + CosNotifyCommS.inl \ + Notify/Structured/StructuredProxyPushSupplier.inl \ + Notify/Structured/StructuredProxyPushConsumer.inl \ Notify/AdminProperties.inl \ - Notify/Any/AnyEvent.inl \ - Notify/Any/CosEC_ProxyPushConsumer.inl \ - Notify/Any/CosEC_ProxyPushSupplier.inl \ - Notify/Any/ProxyPushConsumer.inl \ + Notify/EventChannelFactory.inl \ + Notify/ConsumerAdmin.inl \ Notify/Any/ProxyPushSupplier.inl \ - Notify/Any/PushConsumer.inl \ - Notify/Any/PushSupplier.inl \ - Notify/Buffering_Strategy.inl \ + Notify/Any/ProxyPushConsumer.inl \ Notify/Builder.inl \ + Notify/Subscription_Change_Worker.inl \ + CosEventChannelAdminC.inl \ + Notify/Refcountable.inl \ + CosEventChannelAdminS.inl \ + Notify/ProxySupplier.inl \ + Notify/Supplier.inl \ + Notify/ProxyConsumer.inl \ Notify/Consumer.inl \ - Notify/ConsumerAdmin.inl \ - Notify/CosNotify_Service.inl \ - Notify/Default_Factory.inl \ - Notify/ETCL_Filter.inl \ - Notify/ETCL_FilterFactory.inl \ + Notify/Sequence/Batch_Buffering_Strategy.inl \ Notify/Event.inl \ - Notify/EventChannel.inl \ - Notify/EventChannelFactory.inl \ + CosEventCommC.inl \ + Notify/Worker_Task.inl \ Notify/EventType.inl \ Notify/EventTypeSeq.inl \ - Notify/Event_Manager.inl \ - Notify/FilterAdmin.inl \ - Notify/ID_Factory.inl \ - Notify/Method_Request.inl \ - Notify/Method_Request_Dispatch.inl \ - Notify/Method_Request_Event.inl \ - Notify/Method_Request_Lookup.inl \ - Notify/Method_Request_Shutdown.inl \ - Notify/Method_Request_Updates.inl \ - Notify/Object.inl \ - Notify/POA_Helper.inl \ - Notify/Peer.inl \ - Notify/Properties.inl \ - Notify/PropertySeq.inl \ - Notify/Property_Boolean.inl \ + CosEventCommS.inl \ Notify/Proxy.inl \ - Notify/ProxyConsumer.inl \ - Notify/ProxySupplier.inl \ + Notify/Any/CosEC_ProxyPushSupplier.inl \ + Notify/Any/CosEC_ProxyPushConsumer.inl \ + Notify/SupplierAdmin.inl \ + Notify/Buffering_Strategy.inl \ Notify/QoSProperties.inl \ - Notify/Reactive_Task.inl \ - Notify/Refcountable.inl \ - Notify/Sequence/Batch_Buffering_Strategy.inl \ - Notify/Sequence/SequenceProxyPushConsumer.inl \ - Notify/Sequence/SequenceProxyPushSupplier.inl \ - Notify/Sequence/SequencePushConsumer.inl \ + Notify/Method_Request_Event.inl \ + CosNotifyFilterC.inl \ Notify/Sequence/SequencePushSupplier.inl \ + CosNotifyFilterS.inl \ + Notify/Sequence/SequencePushConsumer.inl \ + Notify/Method_Request_Dispatch.inl \ + Notify/POA_Helper.inl \ Notify/Structured/StructuredEvent.inl \ - Notify/Structured/StructuredProxyPushConsumer.inl \ - Notify/Structured/StructuredProxyPushSupplier.inl \ - Notify/Structured/StructuredPushConsumer.inl \ + Notify/PropertySeq.inl \ + Event_ForwarderC.inl \ + CosNotifyChannelAdminC.inl \ + Event_ForwarderS.inl \ + Notify/FilterAdmin.inl \ + CosNotificationC.inl \ + Notify/Method_Request_Shutdown.inl \ + CosNotifyChannelAdminS.inl \ + Notify/Peer.inl \ + Notify/Any/AnyEvent.inl \ + CosNotificationS.inl \ Notify/Structured/StructuredPushSupplier.inl \ - Notify/Subscription_Change_Worker.inl \ - Notify/Supplier.inl \ - Notify/SupplierAdmin.inl \ - Notify/ThreadPool_Task.inl \ + Notify/Structured/StructuredPushConsumer.inl \ + Notify/Object.inl \ + NotifyExtC.inl \ + Notify/ID_Factory.inl \ + NotifyExtS.inl \ + Notify/Event_Manager.inl \ + Notify/ETCL_FilterFactory.inl \ + Notify/Property_Boolean.inl \ + Notify/Sequence/SequenceProxyPushSupplier.inl \ + Notify/Sequence/SequenceProxyPushConsumer.inl \ + Notify/EventChannel.inl \ + Notify/Method_Request_Updates.inl \ + Notify/ETCL_Filter.inl \ Notify/Timer_Queue.inl \ - Notify/Timer_Reactor.inl \ - Notify/Worker_Task.inl - -endif !BUILD_MINIMUM_CORBA + Notify/Method_Request_Lookup.inl \ + Event_ForwarderS_T.inl \ + CosNotifyFilterS_T.inl \ + NotifyExtS_T.inl \ + CosEventChannelAdminS_T.inl \ + Channel_Clients_T.i \ + CosNotifyCommS_T.inl \ + CosNotificationS_T.inl \ + CosNotifyChannelAdminS_T.inl \ + CosEventCommS_T.inl \ + CosEventCommS_T.cpp \ + CosEventChannelAdminS_T.cpp \ + CosNotificationS_T.cpp \ + CosNotifyCommS_T.cpp \ + CosNotifyFilterS_T.cpp \ + CosNotifyChannelAdminS_T.cpp \ + NotifyExtS_T.cpp \ + Event_ForwarderS_T.cpp \ + Channel_Clients_T.cpp -EXTRA_DIST += \ - CosNotification_Serv.rc ## Makefile.CosTime.am BUILT_SOURCES += \ TimeServiceS_T.cpp \ - TimeServiceC.inl \ - TimeServiceS.inl \ - TimeServiceS_T.inl \ TimeServiceC.cpp \ TimeServiceS.cpp \ TimeServiceC.h \ TimeServiceS.h \ - TimeServiceS_T.h + TimeServiceS_T.h \ + TimeServiceC.inl \ + TimeServiceS.inl \ + TimeServiceS_T.inl CLEANFILES += \ TimeServiceS_T.cpp \ - TimeServiceC.inl \ - TimeServiceS.inl \ - TimeServiceS_T.inl \ TimeServiceC.cpp \ TimeServiceS.cpp \ TimeServiceC.h \ TimeServiceS.h \ TimeServiceS_T.h \ - TimeService-stamp - -TimeServiceS_T.cpp TimeServiceC.inl TimeServiceS.inl TimeServiceS_T.inl TimeServiceC.cpp TimeServiceS.cpp TimeServiceC.h TimeServiceS.h TimeServiceS_T.h: TimeService-stamp + TimeServiceC.inl \ + TimeServiceS.inl \ + TimeServiceS_T.inl -TimeService-stamp: $(srcdir)/TimeService.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl - @touch $@ +TimeServiceS_T.cpp TimeServiceC.cpp TimeServiceS.cpp TimeServiceC.h TimeServiceS.h TimeServiceS_T.h TimeServiceC.inl TimeServiceS.inl TimeServiceS_T.inl: TimeService.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h $(srcdir)/TimeService.idl Time = \ + TimeServiceC.cpp \ + TimeServiceS.cpp \ + Time/Timer_Helper.cpp \ Time/TAO_TIO.cpp \ - Time/TAO_Time_Service_Clerk.cpp \ - Time/TAO_Time_Service_Server.cpp \ Time/TAO_UTO.cpp \ - Time/Timer_Helper.cpp \ - TimeServiceC.cpp \ - TimeServiceS.cpp + Time/TAO_Time_Service_Clerk.cpp \ + Time/TAO_Time_Service_Server.cpp lib_LTLIBRARIES += libTAO_CosTime.la @@ -2142,8 +1863,6 @@ libTAO_CosTime_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_TIME_BUILD_DLL libTAO_CosTime_la_SOURCES = \ @@ -2153,186 +1872,117 @@ libTAO_CosTime_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_CosTime_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - Time/TAO_TIO.h \ - Time/TAO_Time_Service_Clerk.h \ + libTAO_CosNaming.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Channel_Clients_T.h \ + TimeServiceS_T.h \ Time/TAO_Time_Service_Server.h \ Time/TAO_UTO.h \ - Time/Timer_Helper.h \ TimeServiceC.h \ + Time/TAO_Time_Service_Clerk.h \ TimeServiceS.h \ - TimeServiceS_T.h \ - TimeServiceC.inl \ - TimeServiceS.inl \ + Time/TAO_TIO.h \ + Time/Timer_Helper.h \ + Channel_Clients_T.i \ TimeServiceS_T.inl \ TimeServiceS_T.cpp \ - TimeService.idl + Channel_Clients_T.cpp -EXTRA_DIST += \ - CosTime.rc ## Makefile.CosTrading.am BUILT_SOURCES += \ CosTradingS_T.cpp \ - CosTradingC.inl \ - CosTradingS_T.inl \ CosTradingC.cpp \ + CosTradingS.cpp \ CosTradingC.h \ - CosTradingS_T.h + CosTradingS.h \ + CosTradingS_T.h \ + CosTradingC.inl \ + CosTradingS.inl \ + CosTradingS_T.inl CLEANFILES += \ CosTradingS_T.cpp \ - CosTradingC.inl \ - CosTradingS_T.inl \ CosTradingC.cpp \ + CosTradingS.cpp \ CosTradingC.h \ + CosTradingS.h \ CosTradingS_T.h \ - CosTrading-stamp - -CosTradingS_T.cpp CosTradingC.inl CosTradingS_T.inl CosTradingC.cpp CosTradingC.h CosTradingS_T.h: CosTrading-stamp - -CosTrading-stamp: $(srcdir)/CosTrading.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl - @touch $@ - -BUILT_SOURCES += \ - CosTradingDynamicS_T.cpp \ - CosTradingDynamicC.inl \ - CosTradingDynamicS_T.inl \ - CosTradingDynamicC.cpp \ - CosTradingDynamicC.h \ - CosTradingDynamicS_T.h - -CLEANFILES += \ - CosTradingDynamicS_T.cpp \ - CosTradingDynamicC.inl \ - CosTradingDynamicS_T.inl \ - CosTradingDynamicC.cpp \ - CosTradingDynamicC.h \ - CosTradingDynamicS_T.h \ - CosTradingDynamic-stamp - -CosTradingDynamicS_T.cpp CosTradingDynamicC.inl CosTradingDynamicS_T.inl CosTradingDynamicC.cpp CosTradingDynamicC.h CosTradingDynamicS_T.h: CosTradingDynamic-stamp + CosTradingC.inl \ + CosTradingS.inl \ + CosTradingS_T.inl -CosTradingDynamic-stamp: $(srcdir)/CosTradingDynamic.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl - @touch $@ +CosTradingS_T.cpp CosTradingC.cpp CosTradingS.cpp CosTradingC.h CosTradingS.h CosTradingS_T.h CosTradingC.inl CosTradingS.inl CosTradingS_T.inl: CosTrading.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h $(srcdir)/CosTrading.idl BUILT_SOURCES += \ CosTradingReposS_T.cpp \ - CosTradingReposC.inl \ - CosTradingReposS_T.inl \ CosTradingReposC.cpp \ + CosTradingReposS.cpp \ CosTradingReposC.h \ - CosTradingReposS_T.h + CosTradingReposS.h \ + CosTradingReposS_T.h \ + CosTradingReposC.inl \ + CosTradingReposS.inl \ + CosTradingReposS_T.inl CLEANFILES += \ CosTradingReposS_T.cpp \ - CosTradingReposC.inl \ - CosTradingReposS_T.inl \ CosTradingReposC.cpp \ + CosTradingReposS.cpp \ CosTradingReposC.h \ + CosTradingReposS.h \ CosTradingReposS_T.h \ - CosTradingRepos-stamp - -CosTradingReposS_T.cpp CosTradingReposC.inl CosTradingReposS_T.inl CosTradingReposC.cpp CosTradingReposC.h CosTradingReposS_T.h: CosTradingRepos-stamp - -CosTradingRepos-stamp: $(srcdir)/CosTradingRepos.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl - @touch $@ + CosTradingReposC.inl \ + CosTradingReposS.inl \ + CosTradingReposS_T.inl -lib_LTLIBRARIES += libTAO_CosTrading.la +CosTradingReposS_T.cpp CosTradingReposC.cpp CosTradingReposS.cpp CosTradingReposC.h CosTradingReposS.h CosTradingReposS_T.h CosTradingReposC.inl CosTradingReposS.inl CosTradingReposS_T.inl: CosTradingRepos.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h $(srcdir)/CosTradingRepos.idl -libTAO_CosTrading_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_TRADING_BUILD_DLL - -libTAO_CosTrading_la_SOURCES = \ - CosTradingC.cpp \ +BUILT_SOURCES += \ + CosTradingDynamicS_T.cpp \ CosTradingDynamicC.cpp \ - CosTradingReposC.cpp - -libTAO_CosTrading_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_CosTrading_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CosTradingC.h \ + CosTradingDynamicS.cpp \ CosTradingDynamicC.h \ + CosTradingDynamicS.h \ CosTradingDynamicS_T.h \ - CosTradingReposC.h \ - CosTradingReposS_T.h \ - CosTradingS_T.h \ - CosTradingC.inl \ CosTradingDynamicC.inl \ - CosTradingDynamicS_T.inl \ - CosTradingReposC.inl \ - CosTradingReposS_T.inl \ - CosTradingS_T.inl \ - CosTradingDynamicS_T.cpp \ - CosTradingReposS_T.cpp \ - CosTradingS_T.cpp \ - CosTrading.idl \ - CosTradingDynamic.idl \ - CosTradingRepos.idl - -EXTRA_DIST += \ - CosTrading.rc - -## Makefile.CosTrading_Skel.am - -lib_LTLIBRARIES += libTAO_CosTrading_Skel.la - -libTAO_CosTrading_Skel_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_TRADING_SKEL_BUILD_DLL + CosTradingDynamicS.inl \ + CosTradingDynamicS_T.inl -libTAO_CosTrading_Skel_la_SOURCES = \ +CLEANFILES += \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicC.cpp \ CosTradingDynamicS.cpp \ - CosTradingReposS.cpp \ - CosTradingS.cpp - -libTAO_CosTrading_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_CosTrading_Skel_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosTrading.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + CosTradingDynamicC.h \ CosTradingDynamicS.h \ - CosTradingReposS.h \ - CosTradingS.h \ + CosTradingDynamicS_T.h \ + CosTradingDynamicC.inl \ CosTradingDynamicS.inl \ - CosTradingReposS.inl \ - CosTradingS.inl + CosTradingDynamicS_T.inl -EXTRA_DIST += \ - CosTrading_Skel.rc - -## Makefile.CosTrading_Serv.am +CosTradingDynamicS_T.cpp CosTradingDynamicC.cpp CosTradingDynamicS.cpp CosTradingDynamicC.h CosTradingDynamicS.h CosTradingDynamicS_T.h CosTradingDynamicC.inl CosTradingDynamicS.inl CosTradingDynamicS_T.inl: CosTradingDynamic.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h $(srcdir)/CosTradingDynamic.idl Trader = \ + CosTradingC.cpp \ + CosTradingS.cpp \ + CosTradingReposC.cpp \ + CosTradingReposS.cpp \ + CosTradingDynamicC.cpp \ + CosTradingDynamicS.cpp \ Trader/Constraint_Interpreter.cpp \ Trader/Constraint_Nodes.cpp \ Trader/Constraint_Visitors.cpp \ @@ -2344,102 +1994,137 @@ Trader = \ Trader/Offer_Iterators.cpp \ Trader/Service_Type_Repository.cpp \ Trader/Trader.cpp \ + Trader/Trader_Utils.cpp \ Trader/Trader_Constraint_Visitors.cpp \ Trader/Trader_Interfaces.cpp \ - Trader/Trader_Utils.cpp \ Trader/Trading_Loader.cpp -lib_LTLIBRARIES += libTAO_CosTrading_Serv.la +lib_LTLIBRARIES += libTAO_CosTrading.la -libTAO_CosTrading_Serv_la_CPPFLAGS = \ +libTAO_CosTrading_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_TRADING_SERV_BUILD_DLL + -DTAO_TRADING_BUILD_DLL -libTAO_CosTrading_Serv_la_SOURCES = \ +libTAO_CosTrading_la_SOURCES = \ $(Trader) -libTAO_CosTrading_Serv_la_LDFLAGS = \ +libTAO_CosTrading_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ -libTAO_CosTrading_Serv_la_LIBADD = \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - libTAO_CosTrading_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosTrading.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - Trader/Constraint_Interpreter.h \ - Trader/Constraint_Nodes.h \ - Trader/Constraint_Visitors.h \ - Trader/Interpreter.h \ - Trader/Interpreter_Utils.h \ +libTAO_CosTrading_la_LIBADD = \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_DynamicAny.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Trader/Trader_Constraint_Visitors.h \ + Trader/Service_Type_Repository.h \ Trader/Offer_Database.h \ + Trader/Constraint_Nodes.h \ + Trader/Trading_Loader.h \ Trader/Offer_Iterators.h \ - Trader/Service_Type_Repository.h \ + CosTradingDynamicC.h \ + CosTradingDynamicS.h \ + Trader/Constraint_Visitors.h \ + CosTradingC.h \ + CosTradingS.h \ Trader/Trader.h \ - Trader/Trader_Constraint_Visitors.h \ - Trader/Trader_Interfaces.h \ Trader/Trader_Utils.h \ - Trader/Trading_Loader.h + Trader/Interpreter_Utils.h \ + CosTradingReposC.h \ + Trader/Trader_Interfaces.h \ + CosTradingReposS.h \ + Trader/Constraint_Interpreter.h \ + Trader/Interpreter.h \ + CosTradingReposS_T.h \ + CosTradingDynamicS_T.h \ + CosTradingS_T.h \ + Channel_Clients_T.h \ + CosTradingReposS_T.inl \ + CosTradingDynamicS_T.inl \ + CosTradingS_T.inl \ + Channel_Clients_T.i \ + CosTradingS_T.cpp \ + CosTradingReposS_T.cpp \ + CosTradingDynamicS_T.cpp \ + Channel_Clients_T.cpp -EXTRA_DIST += \ - CosTrading_Serv.rc ## Makefile.DsLogAdmin.am BUILT_SOURCES += \ DsLogAdminS_T.cpp \ - DsLogAdminC.inl \ - DsLogAdminS_T.inl \ DsLogAdminC.cpp \ + DsLogAdminS.cpp \ DsLogAdminC.h \ - DsLogAdminS_T.h + DsLogAdminS.h \ + DsLogAdminS_T.h \ + DsLogAdminC.inl \ + DsLogAdminS.inl \ + DsLogAdminS_T.inl CLEANFILES += \ DsLogAdminS_T.cpp \ - DsLogAdminC.inl \ - DsLogAdminS_T.inl \ DsLogAdminC.cpp \ + DsLogAdminS.cpp \ DsLogAdminC.h \ + DsLogAdminS.h \ DsLogAdminS_T.h \ - DsLogAdmin-stamp - -DsLogAdminS_T.cpp DsLogAdminC.inl DsLogAdminS_T.inl DsLogAdminC.cpp DsLogAdminC.h DsLogAdminS_T.h: DsLogAdmin-stamp + DsLogAdminC.inl \ + DsLogAdminS.inl \ + DsLogAdminS_T.inl -DsLogAdmin-stamp: $(srcdir)/DsLogAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl - @touch $@ +DsLogAdminS_T.cpp DsLogAdminC.cpp DsLogAdminS.cpp DsLogAdminC.h DsLogAdminS.h DsLogAdminS_T.h DsLogAdminC.inl DsLogAdminS.inl DsLogAdminS_T.inl: DsLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h $(srcdir)/DsLogAdmin.idl BUILT_SOURCES += \ DsLogNotificationS_T.cpp \ - DsLogNotificationC.inl \ - DsLogNotificationS_T.inl \ DsLogNotificationC.cpp \ + DsLogNotificationS.cpp \ DsLogNotificationC.h \ - DsLogNotificationS_T.h + DsLogNotificationS.h \ + DsLogNotificationS_T.h \ + DsLogNotificationC.inl \ + DsLogNotificationS.inl \ + DsLogNotificationS_T.inl CLEANFILES += \ DsLogNotificationS_T.cpp \ - DsLogNotificationC.inl \ - DsLogNotificationS_T.inl \ DsLogNotificationC.cpp \ + DsLogNotificationS.cpp \ DsLogNotificationC.h \ + DsLogNotificationS.h \ DsLogNotificationS_T.h \ - DsLogNotification-stamp + DsLogNotificationC.inl \ + DsLogNotificationS.inl \ + DsLogNotificationS_T.inl -DsLogNotificationS_T.cpp DsLogNotificationC.inl DsLogNotificationS_T.inl DsLogNotificationC.cpp DsLogNotificationC.h DsLogNotificationS_T.h: DsLogNotification-stamp +DsLogNotificationS_T.cpp DsLogNotificationC.cpp DsLogNotificationS.cpp DsLogNotificationC.h DsLogNotificationS.h DsLogNotificationS_T.h DsLogNotificationC.inl DsLogNotificationS.inl DsLogNotificationS_T.inl: DsLogNotification.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h $(srcdir)/DsLogNotification.idl -DsLogNotification-stamp: $(srcdir)/DsLogNotification.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl - @touch $@ +DsLogAdmin = \ + DsLogAdminC.cpp \ + DsLogAdminS.cpp \ + DsLogNotificationC.cpp \ + DsLogNotificationS.cpp \ + Log/PersistStore.cpp \ + Log/LogRecordStore.cpp \ + Log/BasicLogFactory_i.cpp \ + Log/Iterator_i.cpp \ + Log/BasicLog_i.cpp \ + Log/Log_i.cpp \ + Log/LogMgr_i.cpp \ + Log/Log_Constraint_Visitors.cpp \ + Log/Log_Constraint_Interpreter.cpp \ + Log/LogNotification.cpp lib_LTLIBRARIES += libTAO_DsLogAdmin.la @@ -2448,64 +2133,88 @@ libTAO_DsLogAdmin_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_LOG_BUILD_DLL libTAO_DsLogAdmin_la_SOURCES = \ - DsLogAdminC.cpp \ - DsLogNotificationC.cpp + $(DsLogAdmin) libTAO_DsLogAdmin_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsLogAdmin_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + $(top_builddir)/tao/libTAO_DynamicAny.la \ + libTAO_CosNaming.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + libTAO_ETCL.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Log/Log_Constraint_Visitors.h \ + Log/BasicLogFactory_i.h \ + Log/Iterator_i.h \ + Log/PersistStore.h \ + Log/LogRecordStore.h \ + Log/Log_Constraint_Interpreter.h \ + Log/BasicLog_i.h \ DsLogAdminC.h \ - DsLogAdminS_T.h \ + DsLogAdminS.h \ + Log/LogMgr_i.h \ + Log/Log_i.h \ + Log/LogNotification.h \ DsLogNotificationC.h \ + DsLogNotificationS.h \ DsLogNotificationS_T.h \ - DsLogAdminC.inl \ - DsLogAdminS_T.inl \ - DsLogNotificationC.inl \ + DsLogAdminS_T.h \ + Channel_Clients_T.h \ DsLogNotificationS_T.inl \ + DsLogAdminS_T.inl \ + Channel_Clients_T.i \ DsLogAdminS_T.cpp \ DsLogNotificationS_T.cpp \ - DsLogAdmin.idl \ - DsLogNotification.idl + Channel_Clients_T.cpp -EXTRA_DIST += \ - DsLogAdmin.rc ## Makefile.DsEventLogAdmin.am -if !BUILD_MINIMUM_CORBA - BUILT_SOURCES += \ DsEventLogAdminS_T.cpp \ - DsEventLogAdminC.inl \ - DsEventLogAdminS_T.inl \ DsEventLogAdminC.cpp \ + DsEventLogAdminS.cpp \ DsEventLogAdminC.h \ - DsEventLogAdminS_T.h + DsEventLogAdminS.h \ + DsEventLogAdminS_T.h \ + DsEventLogAdminC.inl \ + DsEventLogAdminS.inl \ + DsEventLogAdminS_T.inl CLEANFILES += \ DsEventLogAdminS_T.cpp \ - DsEventLogAdminC.inl \ - DsEventLogAdminS_T.inl \ DsEventLogAdminC.cpp \ + DsEventLogAdminS.cpp \ DsEventLogAdminC.h \ + DsEventLogAdminS.h \ DsEventLogAdminS_T.h \ - DsEventLogAdmin-stamp + DsEventLogAdminC.inl \ + DsEventLogAdminS.inl \ + DsEventLogAdminS_T.inl -DsEventLogAdminS_T.cpp DsEventLogAdminC.inl DsEventLogAdminS_T.inl DsEventLogAdminC.cpp DsEventLogAdminC.h DsEventLogAdminS_T.h: DsEventLogAdmin-stamp +DsEventLogAdminS_T.cpp DsEventLogAdminC.cpp DsEventLogAdminS.cpp DsEventLogAdminC.h DsEventLogAdminS.h DsEventLogAdminS_T.h DsEventLogAdminC.inl DsEventLogAdminS.inl DsEventLogAdminS_T.inl: DsEventLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_EventLog_Export -Wb,export_include=Log/eventlog_export.h $(srcdir)/DsEventLogAdmin.idl -DsEventLogAdmin-stamp: $(srcdir)/DsEventLogAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl - @touch $@ +DsEventLogAdmin = \ + DsEventLogAdminC.cpp \ + DsEventLogAdminS.cpp \ + Log/EventLogFactory_i.cpp \ + Log/EventLog_i.cpp \ + Log/EventLogConsumer.cpp \ + Log/EventLogNotification.cpp lib_LTLIBRARIES += libTAO_DsEventLogAdmin.la @@ -2514,241 +2223,82 @@ libTAO_DsEventLogAdmin_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_EVENTLOG_BUILD_DLL libTAO_DsEventLogAdmin_la_SOURCES = \ - DsEventLogAdminC.cpp + $(DsEventLogAdmin) libTAO_DsEventLogAdmin_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsEventLogAdmin_la_LIBADD = \ - libTAO_CosEvent.la \ - libTAO_DsLogAdmin.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + libTAO_CosEvent.la \ + libTAO_CosNaming.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + $(top_builddir)/tao/libTAO_IFR_Client.la \ + $(top_builddir)/tao/libTAO_DynamicInterface.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + libTAO_DsLogAdmin.la \ + $(top_builddir)/tao/libTAO_DynamicAny.la \ + libTAO_ETCL.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Log/EventLogConsumer.h \ DsEventLogAdminC.h \ - DsEventLogAdminS_T.h \ - DsEventLogAdminC.inl \ - DsEventLogAdminS_T.inl \ - DsEventLogAdminS_T.cpp \ - DsEventLogAdmin.idl - -endif !BUILD_MINIMUM_CORBA - -EXTRA_DIST += \ - DsEventLogAdmin.rc - -## Makefile.DsLogAdmin_Skel.am - -lib_LTLIBRARIES += libTAO_DsLogAdmin_Skel.la - -libTAO_DsLogAdmin_Skel_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_LOG_SKEL_BUILD_DLL - -libTAO_DsLogAdmin_Skel_la_SOURCES = \ - DsLogAdminS.cpp \ - DsLogNotificationS.cpp - -libTAO_DsLogAdmin_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_DsLogAdmin_Skel_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_DsLogAdmin.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - DsLogAdminS.h \ - DsLogNotificationS.h \ - DsLogAdminS.inl \ - DsLogNotificationS.inl - -## Makefile.DsLogAdmin_Serv.am - -DsLogAdmin = \ - Log/BasicLogFactory_i.cpp \ - Log/BasicLog_i.cpp \ - Log/Iterator_i.cpp \ - Log/LogMgr_i.cpp \ - Log/LogNotification.cpp \ - Log/LogRecordStore.cpp \ - Log/Log_Constraint_Interpreter.cpp \ - Log/Log_Constraint_Visitors.cpp \ - Log/Log_i.cpp \ - Log/PersistStore.cpp - -lib_LTLIBRARIES += libTAO_DsLogAdmin_Serv.la - -libTAO_DsLogAdmin_Serv_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_LOG_SERV_BUILD_DLL - -libTAO_DsLogAdmin_Serv_la_SOURCES = \ - $(DsLogAdmin) - -libTAO_DsLogAdmin_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_DsLogAdmin_Serv_la_LIBADD = \ - libTAO_Svc_Utils.la \ - libTAO_ETCL.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - libTAO_DsLogAdmin_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_DsLogAdmin.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - Log/BasicLogFactory_i.h \ - Log/BasicLog_i.h \ - Log/Iterator_i.h \ - Log/LogMgr_i.h \ - Log/LogNotification.h \ - Log/LogRecordStore.h \ - Log/Log_Constraint_Interpreter.h \ - Log/Log_Constraint_Visitors.h \ - Log/Log_i.h \ - Log/PersistStore.h - -## Makefile.DsEventLogAdmin_Skel.am - -if !BUILD_MINIMUM_CORBA - -lib_LTLIBRARIES += libTAO_DsEventLogAdmin_Skel.la - -libTAO_DsEventLogAdmin_Skel_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DTAO_EVENTLOG_SKEL_BUILD_DLL - -libTAO_DsEventLogAdmin_Skel_la_SOURCES = \ - DsEventLogAdminS.cpp - -libTAO_DsEventLogAdmin_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_DsEventLogAdmin_Skel_la_LIBADD = \ - libTAO_CosEvent_Skel.la \ - libTAO_DsLogAdmin_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_DsEventLogAdmin.la \ - libTAO_CosEvent.la \ - libTAO_DsLogAdmin.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ DsEventLogAdminS.h \ - DsEventLogAdminS.inl - -endif !BUILD_MINIMUM_CORBA - -## Makefile.DsEventLogAdmin_Serv.am - -if !BUILD_MINIMUM_CORBA - -DsEventLogAdmin = \ - Log/EventLogConsumer.cpp \ - Log/EventLogFactory_i.cpp \ - Log/EventLogNotification.cpp \ - Log/EventLog_i.cpp - -lib_LTLIBRARIES += libTAO_DsEventLogAdmin_Serv.la - -libTAO_DsEventLogAdmin_Serv_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DTAO_EVENTLOG_SERV_BUILD_DLL - -libTAO_DsEventLogAdmin_Serv_la_SOURCES = \ - $(DsEventLogAdmin) - -libTAO_DsEventLogAdmin_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_DsEventLogAdmin_Serv_la_LIBADD = \ - libTAO_CosEvent_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_DsLogAdmin_Serv.la \ - libTAO_Svc_Utils.la \ - libTAO_ETCL.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - libTAO_DsEventLogAdmin_Skel.la \ - libTAO_CosEvent_Skel.la \ - libTAO_DsLogAdmin_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_DsEventLogAdmin.la \ - libTAO_CosEvent.la \ - libTAO_DsLogAdmin.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - Log/EventLogConsumer.h \ Log/EventLogFactory_i.h \ + Log/EventLog_i.h \ Log/EventLogNotification.h \ - Log/EventLog_i.h + Channel_Clients_T.h \ + DsEventLogAdminS_T.h \ + Channel_Clients_T.i \ + DsEventLogAdminS_T.inl \ + DsEventLogAdminS_T.cpp \ + Channel_Clients_T.cpp -endif !BUILD_MINIMUM_CORBA ## Makefile.DsNotifyLogAdmin.am -if !BUILD_MINIMUM_CORBA - BUILT_SOURCES += \ DsNotifyLogAdminS_T.cpp \ - DsNotifyLogAdminC.inl \ - DsNotifyLogAdminS_T.inl \ DsNotifyLogAdminC.cpp \ + DsNotifyLogAdminS.cpp \ DsNotifyLogAdminC.h \ - DsNotifyLogAdminS_T.h + DsNotifyLogAdminS.h \ + DsNotifyLogAdminS_T.h \ + DsNotifyLogAdminC.inl \ + DsNotifyLogAdminS.inl \ + DsNotifyLogAdminS_T.inl CLEANFILES += \ DsNotifyLogAdminS_T.cpp \ - DsNotifyLogAdminC.inl \ - DsNotifyLogAdminS_T.inl \ DsNotifyLogAdminC.cpp \ + DsNotifyLogAdminS.cpp \ DsNotifyLogAdminC.h \ + DsNotifyLogAdminS.h \ DsNotifyLogAdminS_T.h \ - DsNotifyLogAdmin-stamp + DsNotifyLogAdminC.inl \ + DsNotifyLogAdminS.inl \ + DsNotifyLogAdminS_T.inl -DsNotifyLogAdminS_T.cpp DsNotifyLogAdminC.inl DsNotifyLogAdminS_T.inl DsNotifyLogAdminC.cpp DsNotifyLogAdminC.h DsNotifyLogAdminS_T.h: DsNotifyLogAdmin-stamp +DsNotifyLogAdminS_T.cpp DsNotifyLogAdminC.cpp DsNotifyLogAdminS.cpp DsNotifyLogAdminC.h DsNotifyLogAdminS.h DsNotifyLogAdminS_T.h DsNotifyLogAdminC.inl DsNotifyLogAdminS.inl DsNotifyLogAdminS_T.inl: DsNotifyLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=Log/notifylog_export.h $(srcdir)/DsNotifyLogAdmin.idl -DsNotifyLogAdmin-stamp: $(srcdir)/DsNotifyLogAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl - @touch $@ +DsNotifyLogAdmin = \ + DsNotifyLogAdminC.cpp \ + DsNotifyLogAdminS.cpp \ + Log/NotifyLogFactory_i.cpp \ + Log/NotifyLog_i.cpp \ + Log/NotifyLogConsumer.cpp \ + Log/NotifyLogNotification.cpp lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin.la @@ -2757,134 +2307,49 @@ libTAO_DsNotifyLogAdmin_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_NOTIFYLOG_BUILD_DLL libTAO_DsNotifyLogAdmin_la_SOURCES = \ - DsNotifyLogAdminC.cpp + $(DsNotifyLogAdmin) libTAO_DsNotifyLogAdmin_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_DsNotifyLogAdmin_la_LIBADD = \ - libTAO_CosNotification.la \ - libTAO_DsEventLogAdmin.la \ - libTAO_CosEvent.la \ - libTAO_DsLogAdmin.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + libTAO_CosNotification.la \ + libTAO_DsEventLogAdmin.la \ + libTAO_CosEvent.la \ + libTAO_CosNaming.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + $(top_builddir)/tao/libTAO_IFR_Client.la \ + $(top_builddir)/tao/libTAO_DynamicInterface.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + libTAO_DsLogAdmin.la \ + $(top_builddir)/tao/libTAO_DynamicAny.la \ + libTAO_ETCL.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Log/NotifyLog_i.h \ DsNotifyLogAdminC.h \ - DsNotifyLogAdminS_T.h \ - DsNotifyLogAdminC.inl \ - DsNotifyLogAdminS_T.inl \ - DsNotifyLogAdminS_T.cpp \ - DsNotifyLogAdmin.idl - -endif !BUILD_MINIMUM_CORBA - -EXTRA_DIST += \ - DsNotifyLogAdmin.rc - -## Makefile.DsNotifyLogAdmin_Skel.am - -if !BUILD_MINIMUM_CORBA - -lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin_Skel.la - -libTAO_DsNotifyLogAdmin_Skel_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DTAO_NOTIFYLOG_SKEL_BUILD_DLL - -libTAO_DsNotifyLogAdmin_Skel_la_SOURCES = \ - DsNotifyLogAdminS.cpp - -libTAO_DsNotifyLogAdmin_Skel_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_DsNotifyLogAdmin_Skel_la_LIBADD = \ - libTAO_CosNotification_Skel.la \ - libTAO_DsEventLogAdmin_Skel.la \ - libTAO_CosEvent_Skel.la \ - libTAO_DsLogAdmin_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_DsNotifyLogAdmin.la \ - libTAO_CosNotification.la \ - libTAO_DsEventLogAdmin.la \ - libTAO_CosEvent.la \ - libTAO_DsLogAdmin.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + Log/NotifyLogFactory_i.h \ DsNotifyLogAdminS.h \ - DsNotifyLogAdminS.inl - -endif !BUILD_MINIMUM_CORBA - -## Makefile.DsNotifyLogAdmin_Serv.am - -if !BUILD_MINIMUM_CORBA - -DsNotifyLogAdmin = \ - Log/NotifyLogConsumer.cpp \ - Log/NotifyLogFactory_i.cpp \ - Log/NotifyLogNotification.cpp \ - Log/NotifyLog_i.cpp - -lib_LTLIBRARIES += libTAO_DsNotifyLogAdmin_Serv.la - -libTAO_DsNotifyLogAdmin_Serv_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ - -DTAO_NOTIFYLOG_SERV_BUILD_DLL - -libTAO_DsNotifyLogAdmin_Serv_la_SOURCES = \ - $(DsNotifyLogAdmin) - -libTAO_DsNotifyLogAdmin_Serv_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_DsNotifyLogAdmin_Serv_la_LIBADD = \ - libTAO_DsLogAdmin_Serv.la \ - libTAO_Svc_Utils.la \ - libTAO_ETCL.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - libTAO_DsNotifyLogAdmin_Skel.la \ - libTAO_CosNotification_Skel.la \ - libTAO_DsEventLogAdmin_Skel.la \ - libTAO_CosEvent_Skel.la \ - libTAO_DsLogAdmin_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_DsNotifyLogAdmin.la \ - libTAO_CosNotification.la \ - libTAO_DsEventLogAdmin.la \ - libTAO_CosEvent.la \ - libTAO_DsLogAdmin.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ Log/NotifyLogConsumer.h \ - Log/NotifyLogFactory_i.h \ Log/NotifyLogNotification.h \ - Log/NotifyLog_i.h + DsNotifyLogAdminS_T.h \ + Channel_Clients_T.h \ + DsNotifyLogAdminS_T.inl \ + Channel_Clients_T.i \ + DsNotifyLogAdminS_T.cpp \ + Channel_Clients_T.cpp -endif !BUILD_MINIMUM_CORBA ## Makefile.FTRT_ClientORB.am @@ -2900,8 +2365,6 @@ libTAO_FTRT_ClientORB_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/ClientORB \ -DTAO_FTRT_BUILD_DLL @@ -2912,152 +2375,151 @@ libTAO_FTRT_ClientORB_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FTRT_ClientORB_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h \ FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h \ FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h \ - FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h + Channel_Clients_T.h \ + Channel_Clients_T.i \ + Channel_Clients_T.cpp + ## Makefile.RTEvent.am BUILT_SOURCES += \ RtecDefaultEventDataS_T.cpp \ - RtecDefaultEventDataC.inl \ - RtecDefaultEventDataS.inl \ - RtecDefaultEventDataS_T.inl \ RtecDefaultEventDataC.cpp \ RtecDefaultEventDataS.cpp \ RtecDefaultEventDataC.h \ RtecDefaultEventDataS.h \ - RtecDefaultEventDataS_T.h + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataC.inl \ + RtecDefaultEventDataS.inl \ + RtecDefaultEventDataS_T.inl CLEANFILES += \ RtecDefaultEventDataS_T.cpp \ - RtecDefaultEventDataC.inl \ - RtecDefaultEventDataS.inl \ - RtecDefaultEventDataS_T.inl \ RtecDefaultEventDataC.cpp \ RtecDefaultEventDataS.cpp \ RtecDefaultEventDataC.h \ RtecDefaultEventDataS.h \ RtecDefaultEventDataS_T.h \ - RtecDefaultEventData-stamp - -RtecDefaultEventDataS_T.cpp RtecDefaultEventDataC.inl RtecDefaultEventDataS.inl RtecDefaultEventDataS_T.inl RtecDefaultEventDataC.cpp RtecDefaultEventDataS.cpp RtecDefaultEventDataC.h RtecDefaultEventDataS.h RtecDefaultEventDataS_T.h: RtecDefaultEventData-stamp - -RtecDefaultEventData-stamp: $(srcdir)/RtecDefaultEventData.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h $(srcdir)/RtecDefaultEventData.idl - @touch $@ - -BUILT_SOURCES += \ - RtecEventChannelAdminS_T.cpp \ - RtecEventChannelAdminC.inl \ - RtecEventChannelAdminS.inl \ - RtecEventChannelAdminS_T.inl \ - RtecEventChannelAdminC.cpp \ - RtecEventChannelAdminS.cpp \ - RtecEventChannelAdminC.h \ - RtecEventChannelAdminS.h \ - RtecEventChannelAdminS_T.h - -CLEANFILES += \ - RtecEventChannelAdminS_T.cpp \ - RtecEventChannelAdminC.inl \ - RtecEventChannelAdminS.inl \ - RtecEventChannelAdminS_T.inl \ - RtecEventChannelAdminC.cpp \ - RtecEventChannelAdminS.cpp \ - RtecEventChannelAdminC.h \ - RtecEventChannelAdminS.h \ - RtecEventChannelAdminS_T.h \ - RtecEventChannelAdmin-stamp - -RtecEventChannelAdminS_T.cpp RtecEventChannelAdminC.inl RtecEventChannelAdminS.inl RtecEventChannelAdminS_T.inl RtecEventChannelAdminC.cpp RtecEventChannelAdminS.cpp RtecEventChannelAdminC.h RtecEventChannelAdminS.h RtecEventChannelAdminS_T.h: RtecEventChannelAdmin-stamp + RtecDefaultEventDataC.inl \ + RtecDefaultEventDataS.inl \ + RtecDefaultEventDataS_T.inl -RtecEventChannelAdmin-stamp: $(srcdir)/RtecEventChannelAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h $(srcdir)/RtecEventChannelAdmin.idl - @touch $@ +RtecDefaultEventDataS_T.cpp RtecDefaultEventDataC.cpp RtecDefaultEventDataS.cpp RtecDefaultEventDataC.h RtecDefaultEventDataS.h RtecDefaultEventDataS_T.h RtecDefaultEventDataC.inl RtecDefaultEventDataS.inl RtecDefaultEventDataS_T.inl: RtecDefaultEventData.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h $(srcdir)/RtecDefaultEventData.idl BUILT_SOURCES += \ RtecEventCommS_T.cpp \ - RtecEventCommC.inl \ - RtecEventCommS.inl \ - RtecEventCommS_T.inl \ RtecEventCommC.cpp \ RtecEventCommS.cpp \ RtecEventCommC.h \ RtecEventCommS.h \ - RtecEventCommS_T.h + RtecEventCommS_T.h \ + RtecEventCommC.inl \ + RtecEventCommS.inl \ + RtecEventCommS_T.inl CLEANFILES += \ RtecEventCommS_T.cpp \ - RtecEventCommC.inl \ - RtecEventCommS.inl \ - RtecEventCommS_T.inl \ RtecEventCommC.cpp \ RtecEventCommS.cpp \ RtecEventCommC.h \ RtecEventCommS.h \ RtecEventCommS_T.h \ - RtecEventComm-stamp + RtecEventCommC.inl \ + RtecEventCommS.inl \ + RtecEventCommS_T.inl + +RtecEventCommS_T.cpp RtecEventCommC.cpp RtecEventCommS.cpp RtecEventCommC.h RtecEventCommS.h RtecEventCommS_T.h RtecEventCommC.inl RtecEventCommS.inl RtecEventCommS_T.inl: RtecEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h $(srcdir)/RtecEventComm.idl -RtecEventCommS_T.cpp RtecEventCommC.inl RtecEventCommS.inl RtecEventCommS_T.inl RtecEventCommC.cpp RtecEventCommS.cpp RtecEventCommC.h RtecEventCommS.h RtecEventCommS_T.h: RtecEventComm-stamp +BUILT_SOURCES += \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminC.cpp \ + RtecEventChannelAdminS.cpp \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminC.inl \ + RtecEventChannelAdminS.inl \ + RtecEventChannelAdminS_T.inl + +CLEANFILES += \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminC.cpp \ + RtecEventChannelAdminS.cpp \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminC.inl \ + RtecEventChannelAdminS.inl \ + RtecEventChannelAdminS_T.inl -RtecEventComm-stamp: $(srcdir)/RtecEventComm.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h $(srcdir)/RtecEventComm.idl - @touch $@ +RtecEventChannelAdminS_T.cpp RtecEventChannelAdminC.cpp RtecEventChannelAdminS.cpp RtecEventChannelAdminC.h RtecEventChannelAdminS.h RtecEventChannelAdminS_T.h RtecEventChannelAdminC.inl RtecEventChannelAdminS.inl RtecEventChannelAdminS_T.inl: RtecEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h $(srcdir)/RtecEventChannelAdmin.idl BUILT_SOURCES += \ RtecUDPAdminS_T.cpp \ - RtecUDPAdminC.inl \ - RtecUDPAdminS.inl \ - RtecUDPAdminS_T.inl \ RtecUDPAdminC.cpp \ RtecUDPAdminS.cpp \ RtecUDPAdminC.h \ RtecUDPAdminS.h \ - RtecUDPAdminS_T.h + RtecUDPAdminS_T.h \ + RtecUDPAdminC.inl \ + RtecUDPAdminS.inl \ + RtecUDPAdminS_T.inl CLEANFILES += \ RtecUDPAdminS_T.cpp \ - RtecUDPAdminC.inl \ - RtecUDPAdminS.inl \ - RtecUDPAdminS_T.inl \ RtecUDPAdminC.cpp \ RtecUDPAdminS.cpp \ RtecUDPAdminC.h \ RtecUDPAdminS.h \ RtecUDPAdminS_T.h \ - RtecUDPAdmin-stamp - -RtecUDPAdminS_T.cpp RtecUDPAdminC.inl RtecUDPAdminS.inl RtecUDPAdminS_T.inl RtecUDPAdminC.cpp RtecUDPAdminS.cpp RtecUDPAdminC.h RtecUDPAdminS.h RtecUDPAdminS_T.h: RtecUDPAdmin-stamp + RtecUDPAdminC.inl \ + RtecUDPAdminS.inl \ + RtecUDPAdminS_T.inl -RtecUDPAdmin-stamp: $(srcdir)/RtecUDPAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h $(srcdir)/RtecUDPAdmin.idl - @touch $@ +RtecUDPAdminS_T.cpp RtecUDPAdminC.cpp RtecUDPAdminS.cpp RtecUDPAdminC.h RtecUDPAdminS.h RtecUDPAdminS_T.h RtecUDPAdminC.inl RtecUDPAdminS.inl RtecUDPAdminS_T.inl: RtecUDPAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h $(srcdir)/RtecUDPAdmin.idl RTEvent = \ + RtecDefaultEventDataC.cpp \ + RtecDefaultEventDataS.cpp \ + RtecEventCommC.cpp \ + RtecEventCommS.cpp \ + RtecEventChannelAdminC.cpp \ + RtecEventChannelAdminS.cpp \ + RtecUDPAdminC.cpp \ + RtecUDPAdminS.cpp \ + Event_Utilities.cpp \ Event/ECG_Adapters.cpp \ Event/ECG_Address_Server_Base.cpp \ Event/ECG_CDR_Message_Receiver.cpp \ Event/ECG_CDR_Message_Sender.cpp \ Event/ECG_Complex_Address_Server.cpp \ - Event/ECG_ConsumerEC_Control.cpp \ Event/ECG_Mcast_EH.cpp \ Event/ECG_Mcast_Gateway.cpp \ - Event/ECG_Reactive_ConsumerEC_Control.cpp \ - Event/ECG_Reconnect_ConsumerEC_Control.cpp \ Event/ECG_Simple_Address_Server.cpp \ Event/ECG_Simple_Mcast_EH.cpp \ Event/ECG_UDP_EH.cpp \ Event/ECG_UDP_Out_Endpoint.cpp \ Event/ECG_UDP_Receiver.cpp \ Event/ECG_UDP_Sender.cpp \ + Event/ECG_ConsumerEC_Control.cpp \ + Event/ECG_Reactive_ConsumerEC_Control.cpp \ + Event/ECG_Reconnect_ConsumerEC_Control.cpp \ Event/EC_And_Filter.cpp \ Event/EC_Basic_Factory.cpp \ Event/EC_Basic_Filter_Builder.cpp \ @@ -3084,8 +2546,8 @@ RTEvent = \ Event/EC_Group_Scheduling.cpp \ Event/EC_Lifetime_Utils.cpp \ Event/EC_Lifetime_Utils_T.cpp \ - Event/EC_MT_Dispatching.cpp \ Event/EC_Masked_Type_Filter.cpp \ + Event/EC_MT_Dispatching.cpp \ Event/EC_Negation_Filter.cpp \ Event/EC_Null_Factory.cpp \ Event/EC_Null_Scheduling.cpp \ @@ -3109,16 +2571,7 @@ RTEvent = \ Event/EC_Timeout_Generator.cpp \ Event/EC_Trivial_Supplier_Filter.cpp \ Event/EC_Type_Filter.cpp \ - Event/EC_UDP_Admin.cpp \ - Event_Utilities.cpp \ - RtecDefaultEventDataC.cpp \ - RtecDefaultEventDataS.cpp \ - RtecEventChannelAdminC.cpp \ - RtecEventChannelAdminS.cpp \ - RtecEventCommC.cpp \ - RtecEventCommS.cpp \ - RtecUDPAdminC.cpp \ - RtecUDPAdminS.cpp + Event/EC_UDP_Admin.cpp lib_LTLIBRARIES += libTAO_RTEvent.la @@ -3127,8 +2580,6 @@ libTAO_RTEvent_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTEVENT_BUILD_DLL libTAO_RTEvent_la_SOURCES = \ @@ -3138,314 +2589,295 @@ libTAO_RTEvent_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEvent_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + $(top_builddir)/tao/libTAO_Messaging.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ Event/ECG_Adapters.h \ - Event/ECG_Address_Server_Base.h \ - Event/ECG_CDR_Message_Receiver.h \ - Event/ECG_CDR_Message_Sender.h \ - Event/ECG_Complex_Address_Server.h \ - Event/ECG_ConsumerEC_Control.h \ - Event/ECG_Mcast_EH.h \ - Event/ECG_Mcast_Gateway.h \ - Event/ECG_Reactive_ConsumerEC_Control.h \ - Event/ECG_Reconnect_ConsumerEC_Control.h \ - Event/ECG_Simple_Address_Server.h \ + Event/EC_Filter_Builder.h \ + Event/EC_Masked_Type_Filter.h \ + Event/EC_Factory.h \ Event/ECG_Simple_Mcast_EH.h \ - Event/ECG_UDP_EH.h \ - Event/ECG_UDP_Out_Endpoint.h \ - Event/ECG_UDP_Receiver.h \ - Event/ECG_UDP_Sender.h \ - Event/EC_And_Filter.h \ + RtecEventChannelAdminC.h \ Event/EC_Basic_Factory.h \ - Event/EC_Basic_Filter_Builder.h \ - Event/EC_Bitmask_Filter.h \ - Event/EC_Busy_Lock.h \ - Event/EC_Channel_Destroyer.h \ - Event/EC_Conjunction_Filter.h \ + Event/EC_MT_Dispatching.h \ + RtecEventChannelAdminS.h \ + Event/EC_Per_Supplier_Filter.h \ + Event/EC_UDP_Admin.h \ + Event/EC_Scheduling_Strategy.h \ + Event/ECG_ConsumerEC_Control.h \ + Event/EC_Timeout_Generator.h \ Event/EC_ConsumerAdmin.h \ - Event/EC_ConsumerControl.h \ - Event/EC_Default_Factory.h \ - Event/EC_Default_ProxyConsumer.h \ - Event/EC_Default_ProxySupplier.h \ - Event/EC_Disjunction_Filter.h \ Event/EC_Dispatching.h \ - Event/EC_Dispatching_Task.h \ + Event/EC_Type_Filter.h \ + Event/EC_Bitmask_Filter.h \ + Event/EC_Group_Scheduling.h \ + Event/EC_Reactive_Dispatching.h \ Event/EC_Event_Channel.h \ + Event/EC_Null_Scheduling.h \ Event/EC_Event_Channel_Base.h \ - Event/EC_Factory.h \ - Event/EC_Filter.h \ - Event/EC_Filter_Builder.h \ - Event/EC_Gateway.h \ + Event/EC_Reactive_Timeout_Generator.h \ + Event/EC_QOS_Info.h \ + Event/EC_ProxySupplier.h \ + Event/EC_ProxyConsumer.h \ + RtecEventCommC.h \ + Event/EC_Conjunction_Filter.h \ + Event/ECG_UDP_Sender.h \ + Event/EC_Supplier_Filter.h \ + RtecEventCommS.h \ + Event/ECG_Address_Server_Base.h \ + RtecUDPAdminC.h \ + Event/EC_Disjunction_Filter.h \ Event/EC_Gateway_IIOP.h \ - Event/EC_Gateway_IIOP_Factory.h \ - Event/EC_Group_Scheduling.h \ - Event/EC_Lifetime_Utils.h \ + RtecUDPAdminS.h \ Event/EC_Lifetime_Utils_T.h \ - Event/EC_MT_Dispatching.h \ - Event/EC_Masked_Type_Filter.h \ - Event/EC_Negation_Filter.h \ - Event/EC_Null_Factory.h \ - Event/EC_Null_Scheduling.h \ - Event/EC_ObserverStrategy.h \ - Event/EC_Per_Supplier_Filter.h \ + Event/EC_Filter.h \ + Event/ECG_UDP_Receiver.h \ + Event/ECG_Complex_Address_Server.h \ + Event/EC_Timeout_Filter.h \ + Event_Utilities.h \ + Event/EC_SupplierAdmin.h \ + Event/ECG_Simple_Address_Server.h \ Event/EC_Prefix_Filter_Builder.h \ - Event/EC_ProxyConsumer.h \ - Event/EC_ProxySupplier.h \ - Event/EC_Proxy_Disconnector.h \ - Event/EC_QOS_Info.h \ - Event/EC_Reactive_ConsumerControl.h \ - Event/EC_Reactive_Dispatching.h \ + Event/EC_Supplier_Filter_Builder.h \ + Event/EC_Gateway_IIOP_Factory.h \ + Event/EC_Busy_Lock.h \ + Event/EC_Default_Factory.h \ + Event/ECG_Mcast_EH.h \ + Event/EC_Default_ProxySupplier.h \ + Event/ECG_UDP_Out_Endpoint.h \ Event/EC_Reactive_SupplierControl.h \ - Event/EC_Reactive_Timeout_Generator.h \ - Event/EC_Scheduling_Strategy.h \ - Event/EC_SupplierAdmin.h \ + Event/EC_Default_ProxyConsumer.h \ + Event/EC_ObserverStrategy.h \ + Event/ECG_Reconnect_ConsumerEC_Control.h \ + Event/EC_Null_Factory.h \ + Event/ECG_CDR_Message_Receiver.h \ Event/EC_SupplierControl.h \ - Event/EC_Supplier_Filter.h \ - Event/EC_Supplier_Filter_Builder.h \ - Event/EC_Timeout_Filter.h \ - Event/EC_Timeout_Generator.h \ - Event/EC_Trivial_Supplier_Filter.h \ - Event/EC_Type_Filter.h \ - Event/EC_UDP_Admin.h \ - Event_Utilities.h \ + Event/EC_Proxy_Disconnector.h \ + Event/EC_Lifetime_Utils.h \ + Event/EC_Channel_Destroyer.h \ + Event/EC_And_Filter.h \ + Event/ECG_UDP_EH.h \ + Event/ECG_Reactive_ConsumerEC_Control.h \ + Event/EC_Gateway.h \ + Event/EC_Dispatching_Task.h \ + Event/EC_Reactive_ConsumerControl.h \ + Event/EC_Negation_Filter.h \ RtecDefaultEventDataC.h \ + Event/ECG_Mcast_Gateway.h \ + Event/EC_Trivial_Supplier_Filter.h \ + Event/ECG_CDR_Message_Sender.h \ + Event/EC_Basic_Filter_Builder.h \ RtecDefaultEventDataS.h \ + Event/EC_ConsumerControl.h \ RtecDefaultEventDataS_T.h \ - RtecEventChannelAdminC.h \ - RtecEventChannelAdminS.h \ + RtecUDPAdminS_T.h \ RtecEventChannelAdminS_T.h \ - RtecEventCommC.h \ - RtecEventCommS.h \ + Channel_Clients_T.h \ RtecEventCommS_T.h \ - RtecUDPAdminC.h \ - RtecUDPAdminS.h \ - RtecUDPAdminS_T.h \ - Event/ECG_Address_Server_Base.i \ - Event/ECG_CDR_Message_Receiver.i \ - Event/ECG_CDR_Message_Sender.i \ - Event/ECG_Complex_Address_Server.i \ - Event/ECG_ConsumerEC_Control.i \ - Event/ECG_Mcast_EH.i \ - Event/ECG_Mcast_Gateway.i \ - Event/ECG_Reactive_ConsumerEC_Control.i \ - Event/ECG_Simple_Address_Server.i \ + Event/EC_Filter_Builder.i \ + Event/EC_Masked_Type_Filter.i \ + Event/EC_Factory.i \ Event/ECG_Simple_Mcast_EH.i \ - Event/ECG_UDP_EH.i \ - Event/ECG_UDP_Out_Endpoint.i \ - Event/ECG_UDP_Receiver.i \ - Event/ECG_UDP_Sender.inl \ - Event/EC_And_Filter.i \ + RtecEventChannelAdminC.inl \ Event/EC_Basic_Factory.i \ - Event/EC_Basic_Filter_Builder.i \ - Event/EC_Bitmask_Filter.i \ - Event/EC_Busy_Lock.i \ - Event/EC_Conjunction_Filter.i \ + Event/EC_MT_Dispatching.i \ + RtecEventChannelAdminS.inl \ + Event/EC_Per_Supplier_Filter.i \ + Event/EC_Scheduling_Strategy.i \ + Event/ECG_ConsumerEC_Control.i \ + Event/EC_Timeout_Generator.i \ Event/EC_ConsumerAdmin.i \ - Event/EC_ConsumerControl.i \ - Event/EC_Default_Factory.i \ - Event/EC_Default_ProxyConsumer.i \ - Event/EC_Default_ProxySupplier.i \ - Event/EC_Disjunction_Filter.i \ Event/EC_Dispatching.i \ - Event/EC_Dispatching_Task.i \ - Event/EC_Event_Channel.i \ - Event/EC_Event_Channel_Base.i \ - Event/EC_Factory.i \ - Event/EC_Filter.i \ - Event/EC_Filter_Builder.i \ - Event/EC_Gateway_IIOP_Factory.i \ + Event/EC_Type_Filter.i \ + Event/EC_Bitmask_Filter.i \ Event/EC_Group_Scheduling.inl \ - Event/EC_Lifetime_Utils.i \ - Event/EC_Lifetime_Utils_T.i \ - Event/EC_MT_Dispatching.i \ - Event/EC_Masked_Type_Filter.i \ - Event/EC_Negation_Filter.i \ - Event/EC_Null_Factory.i \ - Event/EC_Null_Scheduling.i \ - Event/EC_ObserverStrategy.i \ - Event/EC_Per_Supplier_Filter.i \ - Event/EC_Prefix_Filter_Builder.i \ - Event/EC_ProxyConsumer.i \ - Event/EC_ProxySupplier.i \ - Event/EC_QOS_Info.i \ - Event/EC_Reactive_ConsumerControl.i \ Event/EC_Reactive_Dispatching.i \ - Event/EC_Reactive_SupplierControl.i \ + Event/EC_Event_Channel.i \ + Event/EC_Null_Scheduling.i \ + Event/EC_Event_Channel_Base.i \ Event/EC_Reactive_Timeout_Generator.i \ - Event/EC_Scheduling_Strategy.i \ - Event/EC_SupplierAdmin.i \ - Event/EC_SupplierControl.i \ + Event/EC_QOS_Info.i \ + Event/EC_ProxySupplier.i \ + Event/EC_ProxyConsumer.i \ + RtecEventCommC.inl \ + Event/EC_Conjunction_Filter.i \ + Event/ECG_UDP_Sender.inl \ Event/EC_Supplier_Filter.i \ - Event/EC_Supplier_Filter_Builder.i \ + RtecEventCommS.inl \ + Event/ECG_Address_Server_Base.i \ + RtecUDPAdminC.inl \ + Event/EC_Disjunction_Filter.i \ + RtecUDPAdminS.inl \ + Event/EC_Lifetime_Utils_T.i \ + Event/EC_Filter.i \ + Event/ECG_UDP_Receiver.i \ + Event/ECG_Complex_Address_Server.i \ Event/EC_Timeout_Filter.i \ - Event/EC_Timeout_Generator.i \ - Event/EC_Trivial_Supplier_Filter.i \ - Event/EC_Type_Filter.i \ Event_Utilities.i \ + Event/EC_SupplierAdmin.i \ + Event/ECG_Simple_Address_Server.i \ + Event/EC_Prefix_Filter_Builder.i \ + Event/EC_Supplier_Filter_Builder.i \ + Event/EC_Gateway_IIOP_Factory.i \ + Event/EC_Busy_Lock.i \ + Event/EC_Default_Factory.i \ + Event/ECG_Mcast_EH.i \ + Event/EC_Default_ProxySupplier.i \ + Event/ECG_UDP_Out_Endpoint.i \ + Event/EC_Reactive_SupplierControl.i \ + Event/EC_Default_ProxyConsumer.i \ + Event/EC_ObserverStrategy.i \ + Event/EC_Null_Factory.i \ + Event/ECG_CDR_Message_Receiver.i \ + Event/EC_SupplierControl.i \ + Event/EC_Lifetime_Utils.i \ + Event/EC_And_Filter.i \ + Event/ECG_UDP_EH.i \ + Event/ECG_Reactive_ConsumerEC_Control.i \ + Event/EC_Dispatching_Task.i \ + Event/EC_Reactive_ConsumerControl.i \ + Event/EC_Negation_Filter.i \ RtecDefaultEventDataC.inl \ + Event/ECG_Mcast_Gateway.i \ + Event/EC_Trivial_Supplier_Filter.i \ + Event/ECG_CDR_Message_Sender.i \ + Event/EC_Basic_Filter_Builder.i \ RtecDefaultEventDataS.inl \ + Event/EC_ConsumerControl.i \ RtecDefaultEventDataS_T.inl \ - RtecEventChannelAdminC.inl \ - RtecEventChannelAdminS.inl \ + RtecUDPAdminS_T.inl \ RtecEventChannelAdminS_T.inl \ - RtecEventCommC.inl \ - RtecEventCommS.inl \ + Channel_Clients_T.i \ RtecEventCommS_T.inl \ - RtecUDPAdminC.inl \ - RtecUDPAdminS.inl \ - RtecUDPAdminS_T.inl \ RtecDefaultEventDataS_T.cpp \ - RtecEventChannelAdminS_T.cpp \ RtecEventCommS_T.cpp \ + RtecEventChannelAdminS_T.cpp \ RtecUDPAdminS_T.cpp \ - RtecDefaultEventData.idl \ - RtecEventChannelAdmin.idl \ - RtecEventComm.idl \ - RtecUDPAdmin.idl + Channel_Clients_T.cpp -EXTRA_DIST += \ - RTEvent.rc ## Makefile.FtRtEvent.am -if !BUILD_MINIMUM_CORBA - BUILT_SOURCES += \ FTRTS_T.cpp \ - FTRTC.inl \ - FTRTS.inl \ - FTRTS_T.inl \ FTRTC.cpp \ FTRTS.cpp \ FTRTC.h \ FTRTS.h \ - FTRTS_T.h + FTRTS_T.h \ + FTRTC.inl \ + FTRTS.inl \ + FTRTS_T.inl CLEANFILES += \ FTRTS_T.cpp \ - FTRTC.inl \ - FTRTS.inl \ - FTRTS_T.inl \ FTRTC.cpp \ FTRTS.cpp \ FTRTC.h \ FTRTS.h \ FTRTS_T.h \ - FTRT-stamp + FTRTC.inl \ + FTRTS.inl \ + FTRTS_T.inl -FTRTS_T.cpp FTRTC.inl FTRTS.inl FTRTS_T.inl FTRTC.cpp FTRTS.cpp FTRTC.h FTRTS.h FTRTS_T.h: FTRT-stamp +FTRTS_T.cpp FTRTC.cpp FTRTS.cpp FTRTC.h FTRTS.h FTRTS_T.h FTRTC.inl FTRTS.inl FTRTS_T.inl: FTRT.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl -FTRT-stamp: $(srcdir)/FTRT.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl - @touch $@ +BUILT_SOURCES += \ + FtRtecEventCommS_T.cpp \ + FtRtecEventCommC.cpp \ + FtRtecEventCommS.cpp \ + FtRtecEventCommC.h \ + FtRtecEventCommS.h \ + FtRtecEventCommS_T.h \ + FtRtecEventCommC.inl \ + FtRtecEventCommS.inl \ + FtRtecEventCommS_T.inl + +CLEANFILES += \ + FtRtecEventCommS_T.cpp \ + FtRtecEventCommC.cpp \ + FtRtecEventCommS.cpp \ + FtRtecEventCommC.h \ + FtRtecEventCommS.h \ + FtRtecEventCommS_T.h \ + FtRtecEventCommC.inl \ + FtRtecEventCommS.inl \ + FtRtecEventCommS_T.inl + +FtRtecEventCommS_T.cpp FtRtecEventCommC.cpp FtRtecEventCommS.cpp FtRtecEventCommC.h FtRtecEventCommS.h FtRtecEventCommS_T.h FtRtecEventCommC.inl FtRtecEventCommS.inl FtRtecEventCommS_T.inl: FtRtecEventComm.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl BUILT_SOURCES += \ FTRT_GroupManagerS_T.cpp \ - FTRT_GroupManagerC.inl \ - FTRT_GroupManagerS.inl \ - FTRT_GroupManagerS_T.inl \ FTRT_GroupManagerC.cpp \ FTRT_GroupManagerS.cpp \ FTRT_GroupManagerC.h \ FTRT_GroupManagerS.h \ - FTRT_GroupManagerS_T.h + FTRT_GroupManagerS_T.h \ + FTRT_GroupManagerC.inl \ + FTRT_GroupManagerS.inl \ + FTRT_GroupManagerS_T.inl CLEANFILES += \ FTRT_GroupManagerS_T.cpp \ - FTRT_GroupManagerC.inl \ - FTRT_GroupManagerS.inl \ - FTRT_GroupManagerS_T.inl \ FTRT_GroupManagerC.cpp \ FTRT_GroupManagerS.cpp \ FTRT_GroupManagerC.h \ FTRT_GroupManagerS.h \ FTRT_GroupManagerS_T.h \ - FTRT_GroupManager-stamp - -FTRT_GroupManagerS_T.cpp FTRT_GroupManagerC.inl FTRT_GroupManagerS.inl FTRT_GroupManagerS_T.inl FTRT_GroupManagerC.cpp FTRT_GroupManagerS.cpp FTRT_GroupManagerC.h FTRT_GroupManagerS.h FTRT_GroupManagerS_T.h: FTRT_GroupManager-stamp + FTRT_GroupManagerC.inl \ + FTRT_GroupManagerS.inl \ + FTRT_GroupManagerS_T.inl -FTRT_GroupManager-stamp: $(srcdir)/FTRT_GroupManager.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl - @touch $@ +FTRT_GroupManagerS_T.cpp FTRT_GroupManagerC.cpp FTRT_GroupManagerS.cpp FTRT_GroupManagerC.h FTRT_GroupManagerS.h FTRT_GroupManagerS_T.h FTRT_GroupManagerC.inl FTRT_GroupManagerS.inl FTRT_GroupManagerS_T.inl: FTRT_GroupManager.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl BUILT_SOURCES += \ FtRtecEventChannelAdminS_T.cpp \ - FtRtecEventChannelAdminC.inl \ - FtRtecEventChannelAdminS.inl \ - FtRtecEventChannelAdminS_T.inl \ FtRtecEventChannelAdminC.cpp \ FtRtecEventChannelAdminS.cpp \ FtRtecEventChannelAdminC.h \ FtRtecEventChannelAdminS.h \ - FtRtecEventChannelAdminS_T.h + FtRtecEventChannelAdminS_T.h \ + FtRtecEventChannelAdminC.inl \ + FtRtecEventChannelAdminS.inl \ + FtRtecEventChannelAdminS_T.inl CLEANFILES += \ FtRtecEventChannelAdminS_T.cpp \ - FtRtecEventChannelAdminC.inl \ - FtRtecEventChannelAdminS.inl \ - FtRtecEventChannelAdminS_T.inl \ FtRtecEventChannelAdminC.cpp \ FtRtecEventChannelAdminS.cpp \ FtRtecEventChannelAdminC.h \ FtRtecEventChannelAdminS.h \ FtRtecEventChannelAdminS_T.h \ - FtRtecEventChannelAdmin-stamp - -FtRtecEventChannelAdminS_T.cpp FtRtecEventChannelAdminC.inl FtRtecEventChannelAdminS.inl FtRtecEventChannelAdminS_T.inl FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminS.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminS.h FtRtecEventChannelAdminS_T.h: FtRtecEventChannelAdmin-stamp - -FtRtecEventChannelAdmin-stamp: $(srcdir)/FtRtecEventChannelAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl - @touch $@ - -BUILT_SOURCES += \ - FtRtecEventCommS_T.cpp \ - FtRtecEventCommC.inl \ - FtRtecEventCommS.inl \ - FtRtecEventCommS_T.inl \ - FtRtecEventCommC.cpp \ - FtRtecEventCommS.cpp \ - FtRtecEventCommC.h \ - FtRtecEventCommS.h \ - FtRtecEventCommS_T.h - -CLEANFILES += \ - FtRtecEventCommS_T.cpp \ - FtRtecEventCommC.inl \ - FtRtecEventCommS.inl \ - FtRtecEventCommS_T.inl \ - FtRtecEventCommC.cpp \ - FtRtecEventCommS.cpp \ - FtRtecEventCommC.h \ - FtRtecEventCommS.h \ - FtRtecEventCommS_T.h \ - FtRtecEventComm-stamp - -FtRtecEventCommS_T.cpp FtRtecEventCommC.inl FtRtecEventCommS.inl FtRtecEventCommS_T.inl FtRtecEventCommC.cpp FtRtecEventCommS.cpp FtRtecEventCommC.h FtRtecEventCommS.h FtRtecEventCommS_T.h: FtRtecEventComm-stamp + FtRtecEventChannelAdminC.inl \ + FtRtecEventChannelAdminS.inl \ + FtRtecEventChannelAdminS_T.inl -FtRtecEventComm-stamp: $(srcdir)/FtRtecEventComm.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl - @touch $@ +FtRtecEventChannelAdminS_T.cpp FtRtecEventChannelAdminC.cpp FtRtecEventChannelAdminS.cpp FtRtecEventChannelAdminC.h FtRtecEventChannelAdminS.h FtRtecEventChannelAdminS_T.h FtRtecEventChannelAdminC.inl FtRtecEventChannelAdminS.inl FtRtecEventChannelAdminS_T.inl: FtRtecEventChannelAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl FtRtEvent = \ FTRTC.cpp \ FTRTS.cpp \ + FtRtecEventCommC.cpp \ + FtRtecEventCommS.cpp \ FTRT_GroupManagerC.cpp \ FTRT_GroupManagerS.cpp \ - FtRtEvent/Utils/FTEC_Gateway.cpp \ - FtRtEvent/Utils/Log.cpp \ - FtRtEvent/Utils/Safe_InputCDR.cpp \ - FtRtEvent/Utils/UUID.cpp \ FtRtecEventChannelAdminC.cpp \ FtRtecEventChannelAdminS.cpp \ - FtRtecEventCommC.cpp \ - FtRtecEventCommS.cpp + FtRtEvent/Utils/Safe_InputCDR.cpp \ + FtRtEvent/Utils/FTEC_Gateway.cpp \ + FtRtEvent/Utils/Log.cpp \ + FtRtEvent/Utils/UUID.cpp lib_LTLIBRARIES += libTAO_FtRtEvent.la @@ -3454,8 +2886,6 @@ libTAO_FtRtEvent_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_FTRTEVENT_BUILD_DLL libTAO_FtRtEvent_la_SOURCES = \ @@ -3465,76 +2895,76 @@ libTAO_FtRtEvent_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FtRtEvent_la_LIBADD = \ - libTAO_CosNaming.la \ - libTAO_RTEvent.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_FTORB_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + libTAO_CosNaming.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + libTAO_RTEvent.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + libTAO_FTORB_Utils.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_IORManip.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + FtRtEvent/Utils/Safe_InputCDR.h \ FTRTC.h \ + FtRtecEventCommC.h \ FTRTS.h \ - FTRTS_T.h \ + FtRtecEventCommS.h \ FTRT_GroupManagerC.h \ FTRT_GroupManagerS.h \ - FTRT_GroupManagerS_T.h \ - FtRtEvent/Utils/FTEC_Gateway.h \ - FtRtEvent/Utils/Log.h \ - FtRtEvent/Utils/Safe_InputCDR.h \ - FtRtEvent/Utils/UUID.h \ FtRtecEventChannelAdminC.h \ FtRtecEventChannelAdminS.h \ + FtRtEvent/Utils/FTEC_Gateway.h \ + FtRtEvent/Utils/UUID.h \ + FtRtEvent/Utils/Log.h \ + FTRTS_T.h \ + FTRT_GroupManagerS_T.h \ + Channel_Clients_T.h \ FtRtecEventChannelAdminS_T.h \ - FtRtecEventCommC.h \ - FtRtecEventCommS.h \ FtRtecEventCommS_T.h \ + FtRtEvent/Utils/Safe_InputCDR.inl \ FTRTC.inl \ + FtRtecEventCommC.inl \ FTRTS.inl \ - FTRTS_T.inl \ + FtRtecEventCommS.inl \ FTRT_GroupManagerC.inl \ FTRT_GroupManagerS.inl \ - FTRT_GroupManagerS_T.inl \ - FtRtEvent/Utils/FTEC_Gateway.inl \ - FtRtEvent/Utils/Log.inl \ - FtRtEvent/Utils/Safe_InputCDR.inl \ - FtRtEvent/Utils/UUID.inl \ FtRtecEventChannelAdminC.inl \ FtRtecEventChannelAdminS.inl \ + FtRtEvent/Utils/FTEC_Gateway.inl \ + FtRtEvent/Utils/UUID.inl \ + FtRtEvent/Utils/Log.inl \ + FTRTS_T.inl \ + FTRT_GroupManagerS_T.inl \ + Channel_Clients_T.i \ FtRtecEventChannelAdminS_T.inl \ - FtRtecEventCommC.inl \ - FtRtecEventCommS.inl \ FtRtecEventCommS_T.inl \ FTRTS_T.cpp \ FTRT_GroupManagerS_T.cpp \ - FtRtecEventChannelAdminS_T.cpp \ FtRtecEventCommS_T.cpp \ - FTRT.idl \ - FTRT_GroupManager.idl \ - FtRtecEventChannelAdmin.idl \ - FtRtecEventComm.idl + FtRtecEventChannelAdminS_T.cpp \ + Channel_Clients_T.cpp -endif !BUILD_MINIMUM_CORBA ## Makefile.FTRT_EventChannel.am -if BUILD_CORBA_MESSAGING -if !BUILD_MINIMUM_CORBA - FTRT_EventChannel = \ + PortableGroup_Simple_DSC.cpp \ + FtRtEvent/EventChannel/Update_Manager.cpp \ FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp \ FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp \ FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp \ FtRtEvent/EventChannel/Dynamic_Bitset.cpp \ + FtRtEvent/EventChannel/FTEC_Factory.cpp \ FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp \ FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp \ FtRtEvent/EventChannel/FTEC_Event_Channel.cpp \ FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp \ - FtRtEvent/EventChannel/FTEC_Factory.cpp \ FtRtEvent/EventChannel/FTEC_Group_Manager.cpp \ FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp \ FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp \ @@ -3547,19 +2977,17 @@ FTRT_EventChannel = \ FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp \ FtRtEvent/EventChannel/GroupInfoPublisher.cpp \ FtRtEvent/EventChannel/IOGR_Maker.cpp \ - FtRtEvent/EventChannel/Identification_Service.cpp \ FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp \ + FtRtEvent/EventChannel/Identification_Service.cpp \ + FtRtEvent/EventChannel/Request_Context_Repository.cpp \ FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp \ FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp \ FtRtEvent/EventChannel/Replication_Service.cpp \ FtRtEvent/EventChannel/Replication_Strategy.cpp \ - FtRtEvent/EventChannel/Request_Context_Repository.cpp \ FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp \ FtRtEvent/EventChannel/Set_Update_Interceptor.cpp \ - FtRtEvent/EventChannel/Update_Manager.cpp \ FtRtEvent/EventChannel/UpdateableHandler.cpp \ - FtRtEvent/EventChannel/create_persistent_poa.cpp \ - PortableGroup_Simple_DSC.cpp + FtRtEvent/EventChannel/create_persistent_poa.cpp lib_LTLIBRARIES += libTAO_FTRT_EventChannel.la @@ -3568,8 +2996,6 @@ libTAO_FTRT_EventChannel_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/EventChannel \ -DTAO_FTRTEC_BUILD_DLL @@ -3580,80 +3006,78 @@ libTAO_FTRT_EventChannel_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FTRT_EventChannel_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - libTAO_FtRtEvent.la \ - libTAO_CosNaming.la \ - libTAO_RTEvent.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_FTORB_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h \ - FtRtEvent/EventChannel/AMI_Replication_Strategy.h \ - FtRtEvent/EventChannel/Basic_Replication_Strategy.h \ - FtRtEvent/EventChannel/ConnectionHandler_T.h \ - FtRtEvent/EventChannel/Dynamic_Bitset.h \ - FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h \ - FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h \ - FtRtEvent/EventChannel/FTEC_Event_Channel.h \ - FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h \ - FtRtEvent/EventChannel/FTEC_Factory.h \ - FtRtEvent/EventChannel/FTEC_Group_Manager.h \ - FtRtEvent/EventChannel/FTEC_ORBInitializer.h \ - FtRtEvent/EventChannel/FTEC_ProxyConsumer.h \ + $(top_builddir)/tao/libTAO_Utils.la \ + libTAO_FtRtEvent.la \ + libTAO_CosNaming.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + libTAO_RTEvent.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + libTAO_FTORB_Utils.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_IORManip.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + FtRtEvent/EventChannel/Fault_Detector_Loader.h \ + FtRtEvent/EventChannel/create_persistent_poa.h \ + FtRtEvent/EventChannel/Request_Context_Repository.h \ FtRtEvent/EventChannel/FTEC_ProxySupplier.h \ + FtRtEvent/EventChannel/FTEC_ProxyConsumer.h \ + FtRtEvent/EventChannel/FTEC_Group_Manager.h \ FtRtEvent/EventChannel/FTEC_SupplierAdmin.h \ - FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h \ - FtRtEvent/EventChannel/FT_ProxyAdmin_T.h \ - FtRtEvent/EventChannel/Fault_Detector.h \ - FtRtEvent/EventChannel/Fault_Detector_Loader.h \ - FtRtEvent/EventChannel/Fault_Detector_T.h \ - FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h \ - FtRtEvent/EventChannel/FtEventServiceInterceptor.h \ - FtRtEvent/EventChannel/GroupInfoPublisher.h \ - FtRtEvent/EventChannel/IOGR_Maker.h \ FtRtEvent/EventChannel/Identification_Service.h \ + FtRtEvent/EventChannel/GroupInfoPublisher.h \ + FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h \ + FtRtEvent/EventChannel/Set_Update_Interceptor.h \ FtRtEvent/EventChannel/ObjectGroupManagerHandler.h \ - FtRtEvent/EventChannel/ProxyConsumerStateWorker.h \ + FtRtEvent/EventChannel/Dynamic_Bitset.h \ FtRtEvent/EventChannel/ProxySupplierStateWorker.h \ - FtRtEvent/EventChannel/Replication_Service.h \ - FtRtEvent/EventChannel/Replication_Strategy.h \ - FtRtEvent/EventChannel/Request_Context_Repository.h \ FtRtEvent/EventChannel/SCTP_Fault_Detector.h \ - FtRtEvent/EventChannel/Set_Update_Interceptor.h \ - FtRtEvent/EventChannel/Update_Manager.h \ + FtRtEvent/EventChannel/Replication_Strategy.h \ + FtRtEvent/EventChannel/IOGR_Maker.h \ + FtRtEvent/EventChannel/FTEC_ORBInitializer.h \ + FtRtEvent/EventChannel/FtEventServiceInterceptor.h \ + FtRtEvent/EventChannel/Basic_Replication_Strategy.h \ + FtRtEvent/EventChannel/FTEC_Factory.h \ + FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h \ FtRtEvent/EventChannel/UpdateableHandler.h \ - FtRtEvent/EventChannel/create_persistent_poa.h \ + FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h \ + FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h \ + FtRtEvent/EventChannel/Update_Manager.h \ + FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h \ + FtRtEvent/EventChannel/Fault_Detector.h \ + FtRtEvent/EventChannel/Replication_Service.h \ + FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h \ + FtRtEvent/EventChannel/AMI_Replication_Strategy.h \ + FtRtEvent/EventChannel/ProxyConsumerStateWorker.h \ + FtRtEvent/EventChannel/FTEC_Event_Channel.h \ FtRtEvent/EventChannel/ftrtec_export.h \ + FtRtEvent/EventChannel/FT_ProxyAdmin_T.h \ + FtRtEvent/EventChannel/ConnectionHandler_T.h \ + FtRtEvent/EventChannel/Fault_Detector_T.h \ FtRtEvent/EventChannel/Dynamic_Bitset.inl \ FtRtEvent/EventChannel/ConnectionHandler_T.cpp \ - FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp \ - FtRtEvent/EventChannel/Fault_Detector_T.cpp + FtRtEvent/EventChannel/Fault_Detector_T.cpp \ + FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp -endif !BUILD_MINIMUM_CORBA -endif BUILD_CORBA_MESSAGING ## Makefile.FT_ClientORB.am -if BUILD_ACE_UUID -if !BUILD_MINIMUM_CORBA - FT_ClientORB = \ + FaultTolerance/FT_ClientRequest_Interceptor.cpp \ FaultTolerance/FT_ClientORBInitializer.cpp \ FaultTolerance/FT_ClientPolicyFactory.cpp \ FaultTolerance/FT_ClientPolicy_i.cpp \ - FaultTolerance/FT_ClientRequest_Interceptor.cpp \ FaultTolerance/FT_ClientService_Activate.cpp \ FaultTolerance/FT_Endpoint_Selector_Factory.cpp \ FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp \ - FaultTolerance/FT_Service_Callbacks.cpp \ - PortableGroup_Simple_DSC.cpp + PortableGroup_Simple_DSC.cpp \ + FaultTolerance/FT_Service_Callbacks.cpp lib_LTLIBRARIES += libTAO_FT_ClientORB.la @@ -3662,8 +3086,6 @@ libTAO_FT_ClientORB_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_FT_CLIENTORB_BUILD_DLL libTAO_FT_ClientORB_la_SOURCES = \ @@ -3673,43 +3095,46 @@ libTAO_FT_ClientORB_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FT_ClientORB_la_LIBADD = \ - libTAO_PortableGroup.la \ - libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_FTORB_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - FaultTolerance/FT_ClientORBInitializer.h \ - FaultTolerance/FT_ClientPolicyFactory.h \ - FaultTolerance/FT_ClientPolicy_i.h \ + libTAO_PortableGroup.la \ + libTAO_CosNaming.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + libTAO_FTORB_Utils.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_IORManip.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ FaultTolerance/FT_ClientRequest_Interceptor.h \ - FaultTolerance/FT_ClientService_Activate.h \ - FaultTolerance/FT_Endpoint_Selector_Factory.h \ + FaultTolerance/FT_ClientPolicy_i.h \ FaultTolerance/FT_Invocation_Endpoint_Selectors.h \ + FaultTolerance/FT_ClientORBInitializer.h \ + FaultTolerance/FT_ClientPolicyFactory.h \ FaultTolerance/FT_Service_Callbacks.h \ + FaultTolerance/FT_Endpoint_Selector_Factory.h \ + FaultTolerance/FT_ClientService_Activate.h \ + Channel_Clients_T.h \ FaultTolerance/FT_ClientPolicy_i.inl \ FaultTolerance/FT_Invocation_Endpoint_Selectors.inl \ - FaultTolerance/FT_Service_Callbacks.i + FaultTolerance/FT_Service_Callbacks.i \ + Channel_Clients_T.i \ + Channel_Clients_T.cpp -endif !BUILD_MINIMUM_CORBA -endif BUILD_ACE_UUID ## Makefile.FT_ServerORB.am -if !BUILD_MINIMUM_CORBA - FT_ServerORB = \ FaultTolerance/FT_ServerORBInitializer.cpp \ FaultTolerance/FT_ServerPolicyFactory.cpp \ FaultTolerance/FT_ServerPolicy_i.cpp \ FaultTolerance/FT_ServerRequest_Interceptor.cpp \ - FaultTolerance/FT_ServerService_Activate.cpp \ - PortableGroup_Simple_DSC.cpp + PortableGroup_Simple_DSC.cpp \ + FaultTolerance/FT_ServerService_Activate.cpp lib_LTLIBRARIES += libTAO_FT_ServerORB.la @@ -3718,8 +3143,6 @@ libTAO_FT_ServerORB_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_FT_SERVERORB_BUILD_DLL libTAO_FT_ServerORB_la_SOURCES = \ @@ -3729,187 +3152,170 @@ libTAO_FT_ServerORB_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FT_ServerORB_la_LIBADD = \ - libTAO_PortableGroup.la \ - libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_FTORB_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - FaultTolerance/FT_ServerORBInitializer.h \ + libTAO_PortableGroup.la \ + libTAO_CosNaming.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + libTAO_FTORB_Utils.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_IORManip.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Channel_Clients_T.h \ FaultTolerance/FT_ServerPolicyFactory.h \ - FaultTolerance/FT_ServerPolicy_i.h \ FaultTolerance/FT_ServerRequest_Interceptor.h \ + FaultTolerance/FT_ServerPolicy_i.h \ + FaultTolerance/FT_ServerORBInitializer.h \ FaultTolerance/FT_ServerService_Activate.h \ - FaultTolerance/FT_ServerPolicy_i.inl + Channel_Clients_T.i \ + FaultTolerance/FT_ServerPolicy_i.inl \ + Channel_Clients_T.cpp -endif !BUILD_MINIMUM_CORBA ## Makefile.FaultTolerance.am -if BUILD_ACE_UUID -if !BUILD_MINIMUM_CORBA - BUILT_SOURCES += \ FT_CORBAS_T.cpp \ - FT_CORBAC.inl \ - FT_CORBAS.inl \ - FT_CORBAS_T.inl \ FT_CORBAC.cpp \ FT_CORBAS.cpp \ FT_CORBAC.h \ FT_CORBAS.h \ - FT_CORBAS_T.h + FT_CORBAS_T.h \ + FT_CORBAC.inl \ + FT_CORBAS.inl \ + FT_CORBAS_T.inl CLEANFILES += \ FT_CORBAS_T.cpp \ - FT_CORBAC.inl \ - FT_CORBAS.inl \ - FT_CORBAS_T.inl \ FT_CORBAC.cpp \ FT_CORBAS.cpp \ FT_CORBAC.h \ FT_CORBAS.h \ FT_CORBAS_T.h \ - FT_CORBA-stamp - -FT_CORBAS_T.cpp FT_CORBAC.inl FT_CORBAS.inl FT_CORBAS_T.inl FT_CORBAC.cpp FT_CORBAS.cpp FT_CORBAC.h FT_CORBAS.h FT_CORBAS_T.h: FT_CORBA-stamp + FT_CORBAC.inl \ + FT_CORBAS.inl \ + FT_CORBAS_T.inl -FT_CORBA-stamp: $(srcdir)/FT_CORBA.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl - @touch $@ +FT_CORBAS_T.cpp FT_CORBAC.cpp FT_CORBAS.cpp FT_CORBAC.h FT_CORBAS.h FT_CORBAS_T.h FT_CORBAC.inl FT_CORBAS.inl FT_CORBAS_T.inl: FT_CORBA.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl BUILT_SOURCES += \ - FT_FaultDetectorFactoryS_T.cpp \ - FT_FaultDetectorFactoryC.inl \ - FT_FaultDetectorFactoryS.inl \ - FT_FaultDetectorFactoryS_T.inl \ - FT_FaultDetectorFactoryC.cpp \ - FT_FaultDetectorFactoryS.cpp \ - FT_FaultDetectorFactoryC.h \ - FT_FaultDetectorFactoryS.h \ - FT_FaultDetectorFactoryS_T.h + FT_ReplicaS_T.cpp \ + FT_ReplicaC.cpp \ + FT_ReplicaS.cpp \ + FT_ReplicaC.h \ + FT_ReplicaS.h \ + FT_ReplicaS_T.h \ + FT_ReplicaC.inl \ + FT_ReplicaS.inl \ + FT_ReplicaS_T.inl CLEANFILES += \ - FT_FaultDetectorFactoryS_T.cpp \ - FT_FaultDetectorFactoryC.inl \ - FT_FaultDetectorFactoryS.inl \ - FT_FaultDetectorFactoryS_T.inl \ - FT_FaultDetectorFactoryC.cpp \ - FT_FaultDetectorFactoryS.cpp \ - FT_FaultDetectorFactoryC.h \ - FT_FaultDetectorFactoryS.h \ - FT_FaultDetectorFactoryS_T.h \ - FT_FaultDetectorFactory-stamp - -FT_FaultDetectorFactoryS_T.cpp FT_FaultDetectorFactoryC.inl FT_FaultDetectorFactoryS.inl FT_FaultDetectorFactoryS_T.inl FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryS.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryS.h FT_FaultDetectorFactoryS_T.h: FT_FaultDetectorFactory-stamp + FT_ReplicaS_T.cpp \ + FT_ReplicaC.cpp \ + FT_ReplicaS.cpp \ + FT_ReplicaC.h \ + FT_ReplicaS.h \ + FT_ReplicaS_T.h \ + FT_ReplicaC.inl \ + FT_ReplicaS.inl \ + FT_ReplicaS_T.inl -FT_FaultDetectorFactory-stamp: $(srcdir)/FT_FaultDetectorFactory.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl - @touch $@ +FT_ReplicaS_T.cpp FT_ReplicaC.cpp FT_ReplicaS.cpp FT_ReplicaC.h FT_ReplicaS.h FT_ReplicaS_T.h FT_ReplicaC.inl FT_ReplicaS.inl FT_ReplicaS_T.inl: FT_Replica.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl BUILT_SOURCES += \ FT_NotifierS_T.cpp \ - FT_NotifierC.inl \ - FT_NotifierS.inl \ - FT_NotifierS_T.inl \ FT_NotifierC.cpp \ FT_NotifierS.cpp \ FT_NotifierC.h \ FT_NotifierS.h \ - FT_NotifierS_T.h + FT_NotifierS_T.h \ + FT_NotifierC.inl \ + FT_NotifierS.inl \ + FT_NotifierS_T.inl CLEANFILES += \ FT_NotifierS_T.cpp \ - FT_NotifierC.inl \ - FT_NotifierS.inl \ - FT_NotifierS_T.inl \ FT_NotifierC.cpp \ FT_NotifierS.cpp \ FT_NotifierC.h \ FT_NotifierS.h \ FT_NotifierS_T.h \ - FT_Notifier-stamp - -FT_NotifierS_T.cpp FT_NotifierC.inl FT_NotifierS.inl FT_NotifierS_T.inl FT_NotifierC.cpp FT_NotifierS.cpp FT_NotifierC.h FT_NotifierS.h FT_NotifierS_T.h: FT_Notifier-stamp + FT_NotifierC.inl \ + FT_NotifierS.inl \ + FT_NotifierS_T.inl -FT_Notifier-stamp: $(srcdir)/FT_Notifier.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl - @touch $@ +FT_NotifierS_T.cpp FT_NotifierC.cpp FT_NotifierS.cpp FT_NotifierC.h FT_NotifierS.h FT_NotifierS_T.h FT_NotifierC.inl FT_NotifierS.inl FT_NotifierS_T.inl: FT_Notifier.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl BUILT_SOURCES += \ - FT_ReplicaS_T.cpp \ - FT_ReplicaC.inl \ - FT_ReplicaS.inl \ - FT_ReplicaS_T.inl \ - FT_ReplicaC.cpp \ - FT_ReplicaS.cpp \ - FT_ReplicaC.h \ - FT_ReplicaS.h \ - FT_ReplicaS_T.h + FT_FaultDetectorFactoryS_T.cpp \ + FT_FaultDetectorFactoryC.cpp \ + FT_FaultDetectorFactoryS.cpp \ + FT_FaultDetectorFactoryC.h \ + FT_FaultDetectorFactoryS.h \ + FT_FaultDetectorFactoryS_T.h \ + FT_FaultDetectorFactoryC.inl \ + FT_FaultDetectorFactoryS.inl \ + FT_FaultDetectorFactoryS_T.inl CLEANFILES += \ - FT_ReplicaS_T.cpp \ - FT_ReplicaC.inl \ - FT_ReplicaS.inl \ - FT_ReplicaS_T.inl \ - FT_ReplicaC.cpp \ - FT_ReplicaS.cpp \ - FT_ReplicaC.h \ - FT_ReplicaS.h \ - FT_ReplicaS_T.h \ - FT_Replica-stamp - -FT_ReplicaS_T.cpp FT_ReplicaC.inl FT_ReplicaS.inl FT_ReplicaS_T.inl FT_ReplicaC.cpp FT_ReplicaS.cpp FT_ReplicaC.h FT_ReplicaS.h FT_ReplicaS_T.h: FT_Replica-stamp + FT_FaultDetectorFactoryS_T.cpp \ + FT_FaultDetectorFactoryC.cpp \ + FT_FaultDetectorFactoryS.cpp \ + FT_FaultDetectorFactoryC.h \ + FT_FaultDetectorFactoryS.h \ + FT_FaultDetectorFactoryS_T.h \ + FT_FaultDetectorFactoryC.inl \ + FT_FaultDetectorFactoryS.inl \ + FT_FaultDetectorFactoryS_T.inl -FT_Replica-stamp: $(srcdir)/FT_Replica.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl - @touch $@ +FT_FaultDetectorFactoryS_T.cpp FT_FaultDetectorFactoryC.cpp FT_FaultDetectorFactoryS.cpp FT_FaultDetectorFactoryC.h FT_FaultDetectorFactoryS.h FT_FaultDetectorFactoryS_T.h FT_FaultDetectorFactoryC.inl FT_FaultDetectorFactoryS.inl FT_FaultDetectorFactoryS_T.inl: FT_FaultDetectorFactory.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl BUILT_SOURCES += \ FT_ReplicationManagerS_T.cpp \ - FT_ReplicationManagerC.inl \ - FT_ReplicationManagerS.inl \ - FT_ReplicationManagerS_T.inl \ FT_ReplicationManagerC.cpp \ FT_ReplicationManagerS.cpp \ FT_ReplicationManagerC.h \ FT_ReplicationManagerS.h \ - FT_ReplicationManagerS_T.h + FT_ReplicationManagerS_T.h \ + FT_ReplicationManagerC.inl \ + FT_ReplicationManagerS.inl \ + FT_ReplicationManagerS_T.inl CLEANFILES += \ FT_ReplicationManagerS_T.cpp \ - FT_ReplicationManagerC.inl \ - FT_ReplicationManagerS.inl \ - FT_ReplicationManagerS_T.inl \ FT_ReplicationManagerC.cpp \ FT_ReplicationManagerS.cpp \ FT_ReplicationManagerC.h \ FT_ReplicationManagerS.h \ FT_ReplicationManagerS_T.h \ - FT_ReplicationManager-stamp - -FT_ReplicationManagerS_T.cpp FT_ReplicationManagerC.inl FT_ReplicationManagerS.inl FT_ReplicationManagerS_T.inl FT_ReplicationManagerC.cpp FT_ReplicationManagerS.cpp FT_ReplicationManagerC.h FT_ReplicationManagerS.h FT_ReplicationManagerS_T.h: FT_ReplicationManager-stamp + FT_ReplicationManagerC.inl \ + FT_ReplicationManagerS.inl \ + FT_ReplicationManagerS_T.inl -FT_ReplicationManager-stamp: $(srcdir)/FT_ReplicationManager.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl - @touch $@ +FT_ReplicationManagerS_T.cpp FT_ReplicationManagerC.cpp FT_ReplicationManagerS.cpp FT_ReplicationManagerC.h FT_ReplicationManagerS.h FT_ReplicationManagerS_T.h FT_ReplicationManagerC.inl FT_ReplicationManagerS.inl FT_ReplicationManagerS_T.inl: FT_ReplicationManager.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl FaultTolerance = \ FT_CORBAC.cpp \ FT_CORBAS.cpp \ - FT_FaultDetectorFactoryC.cpp \ - FT_FaultDetectorFactoryS.cpp \ - FT_NotifierC.cpp \ - FT_NotifierS.cpp \ - FT_ReplicaC.cpp \ FT_ReplicaS.cpp \ - FT_ReplicationManagerC.cpp \ - FT_ReplicationManagerS.cpp + FT_ReplicaC.cpp \ + FT_NotifierS.cpp \ + FT_NotifierC.cpp \ + FT_FaultDetectorFactoryS.cpp \ + FT_FaultDetectorFactoryC.cpp \ + FT_ReplicationManagerS.cpp \ + FT_ReplicationManagerC.cpp lib_LTLIBRARIES += libTAO_FaultTolerance.la @@ -3918,9 +3324,6 @@ libTAO_FaultTolerance_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_FT_BUILD_DLL libTAO_FaultTolerance_la_SOURCES = \ @@ -3930,72 +3333,48 @@ libTAO_FaultTolerance_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FaultTolerance_la_LIBADD = \ - libTAO_PortableGroup.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_CosNaming.la \ - libTAO_FT_ServerORB.la \ - libTAO_FT_ClientORB.la \ - libTAO_FTORB_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - libTAO_CosNotification.la \ - libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - FT_CORBAC.h \ - FT_CORBAS.h \ - FT_CORBAS_T.h \ - FT_FaultDetectorFactoryC.h \ - FT_FaultDetectorFactoryS.h \ + libTAO_PortableGroup.la \ + libTAO_CosNaming.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + libTAO_FT_ServerORB.la \ + libTAO_FT_ClientORB.la \ + libTAO_FTORB_Utils.la \ + $(top_builddir)/tao/libTAO_IORManip.la \ + libTAO_CosNotification.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_DynamicAny.la \ + libTAO_ETCL.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ FT_FaultDetectorFactoryS_T.h \ - FT_NotifierC.h \ - FT_NotifierS.h \ - FT_NotifierS_T.h \ - FT_ReplicaC.h \ - FT_ReplicaS.h \ - FT_ReplicaS_T.h \ - FT_ReplicationManagerC.h \ - FT_ReplicationManagerS.h \ + Channel_Clients_T.h \ FT_ReplicationManagerS_T.h \ - FT_CORBAC.inl \ - FT_CORBAS.inl \ - FT_CORBAS_T.inl \ - FT_FaultDetectorFactoryC.inl \ - FT_FaultDetectorFactoryS.inl \ + FT_ReplicaS_T.h \ + FT_NotifierS_T.h \ + FT_CORBAS_T.h \ FT_FaultDetectorFactoryS_T.inl \ - FT_NotifierC.inl \ - FT_NotifierS.inl \ - FT_NotifierS_T.inl \ - FT_ReplicaC.inl \ - FT_ReplicaS.inl \ - FT_ReplicaS_T.inl \ - FT_ReplicationManagerC.inl \ - FT_ReplicationManagerS.inl \ + Channel_Clients_T.i \ FT_ReplicationManagerS_T.inl \ + FT_ReplicaS_T.inl \ + FT_NotifierS_T.inl \ + FT_CORBAS_T.inl \ FT_CORBAS_T.cpp \ - FT_FaultDetectorFactoryS_T.cpp \ - FT_NotifierS_T.cpp \ FT_ReplicaS_T.cpp \ FT_ReplicationManagerS_T.cpp \ - FT_CORBA.idl \ - FT_FaultDetectorFactory.idl \ - FT_Notifier.idl \ - FT_Replica.idl \ - FT_ReplicationManager.idl - -endif !BUILD_MINIMUM_CORBA -endif BUILD_ACE_UUID + FT_NotifierS_T.cpp \ + FT_FaultDetectorFactoryS_T.cpp \ + Channel_Clients_T.cpp -EXTRA_DIST += \ - FaultTolerance.rc ## Makefile.IFRService.am -if !BUILD_MINIMUM_CORBA - IFRService = \ IFRService/AbstractInterfaceDef_i.cpp \ IFRService/AliasDef_i.cpp \ @@ -4014,6 +3393,7 @@ IFRService = \ IFRService/EventDef_i.cpp \ IFRService/EventPortDef_i.cpp \ IFRService/ExceptionDef_i.cpp \ + IFRService/IFR_BaseS.cpp \ IFRService/ExtAbstractInterfaceDef_i.cpp \ IFRService/ExtAttributeDef_i.cpp \ IFRService/ExtInterfaceDef_i.cpp \ @@ -4024,20 +3404,19 @@ IFRService = \ IFRService/FixedDef_i.cpp \ IFRService/HomeDef_i.cpp \ IFRService/IDLType_i.cpp \ - IFRService/IFR_BaseS.cpp \ - IFRService/IFR_BasicS.cpp \ IFRService/IFR_ComponentsS.cpp \ - IFRService/IFR_ExtendedS.cpp \ + IFRService/IFR_BasicS.cpp \ IFRService/IFR_Service_Loader.cpp \ + IFRService/IFR_ExtendedS.cpp \ IFRService/IFR_Service_Utils.cpp \ - IFRService/IRObject_i.cpp \ IFRService/InterfaceAttrExtension_i.cpp \ + IFRService/IRObject_i.cpp \ IFRService/InterfaceDef_i.cpp \ + IFRService/Options.cpp \ IFRService/LocalInterfaceDef_i.cpp \ IFRService/ModuleDef_i.cpp \ IFRService/NativeDef_i.cpp \ IFRService/OperationDef_i.cpp \ - IFRService/Options.cpp \ IFRService/PrimitiveDef_i.cpp \ IFRService/ProvidesDef_i.cpp \ IFRService/PublishesDef_i.cpp \ @@ -4061,8 +3440,6 @@ libTAO_IFRService_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_IFRSERVICE_BUILD_DLL libTAO_IFRService_la_SOURCES = \ @@ -4072,84 +3449,84 @@ libTAO_IFRService_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IFRService_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + $(top_builddir)/tao/libTAO_IORTable.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_TypeCodeFactory.la \ + $(top_builddir)/tao/libTAO_IFR_Client.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + IFRService/ComponentRepository_i.h \ + IFRService/ExtAbstractInterfaceDef_i.h \ + IFRService/ComponentContainer_i.h \ + IFRService/InterfaceAttrExtension_i.h \ + IFRService/IFR_BaseS.h \ + IFRService/EventPortDef_i.h \ + IFRService/FinderDef_i.h \ + IFRService/EmitsDef_i.h \ + IFRService/Container_i.h \ + IFRService/AttributeDef_i.h \ + IFRService/ConsumesDef_i.h \ + IFRService/ProvidesDef_i.h \ + IFRService/InterfaceDef_i.h \ + IFRService/OperationDef_i.h \ + IFRService/FactoryDef_i.h \ + IFRService/EnumDef_i.h \ + IFRService/ExtAttributeDef_i.h \ + IFRService/FixedDef_i.h \ + IFRService/ExtLocalInterfaceDef_i.h \ IFRService/AbstractInterfaceDef_i.h \ + IFRService/ExtInterfaceDef_i.h \ + IFRService/LocalInterfaceDef_i.h \ + IFRService/UnionDef_i.h \ IFRService/AliasDef_i.h \ - IFRService/ArrayDef_i.h \ - IFRService/AttributeDef_i.h \ - IFRService/ComponentContainer_i.h \ + IFRService/PublishesDef_i.h \ IFRService/ComponentDef_i.h \ IFRService/ComponentModuleDef_i.h \ - IFRService/ComponentRepository_i.h \ - IFRService/ConstantDef_i.h \ - IFRService/ConsumesDef_i.h \ + IFRService/ValueMemberDef_i.h \ + IFRService/ValueDef_i.h \ + IFRService/TypedefDef_i.h \ + IFRService/Options.h \ IFRService/Contained_i.h \ - IFRService/Container_i.h \ - IFRService/EmitsDef_i.h \ - IFRService/EnumDef_i.h \ + IFRService/PrimitiveDef_i.h \ IFRService/EventDef_i.h \ - IFRService/EventPortDef_i.h \ IFRService/ExceptionDef_i.h \ - IFRService/ExtAbstractInterfaceDef_i.h \ - IFRService/ExtAttributeDef_i.h \ - IFRService/ExtInterfaceDef_i.h \ - IFRService/ExtLocalInterfaceDef_i.h \ - IFRService/ExtValueDef_i.h \ - IFRService/FactoryDef_i.h \ - IFRService/FinderDef_i.h \ - IFRService/FixedDef_i.h \ + IFRService/IFR_Service_Utils.h \ + IFRService/ArrayDef_i.h \ + IFRService/IFR_ExtendedS.h \ + IFRService/StructDef_i.h \ IFRService/HomeDef_i.h \ - IFRService/IDLType_i.h \ - IFRService/IFR_BaseS.h \ - IFRService/IFR_BasicS.h \ + IFRService/ConstantDef_i.h \ IFRService/IFR_ComponentsS.h \ - IFRService/IFR_ExtendedS.h \ - IFRService/IFR_Service_Loader.h \ - IFRService/IFR_Service_Utils.h \ - IFRService/IRObject_i.h \ - IFRService/InterfaceAttrExtension_i.h \ - IFRService/InterfaceDef_i.h \ - IFRService/LocalInterfaceDef_i.h \ + IFRService/IFR_BasicS.h \ IFRService/ModuleDef_i.h \ - IFRService/NativeDef_i.h \ - IFRService/OperationDef_i.h \ - IFRService/Options.h \ - IFRService/PrimitiveDef_i.h \ - IFRService/ProvidesDef_i.h \ - IFRService/PublishesDef_i.h \ + IFRService/WstringDef_i.h \ + IFRService/StringDef_i.h \ IFRService/Repository_i.h \ IFRService/SequenceDef_i.h \ - IFRService/StringDef_i.h \ - IFRService/StructDef_i.h \ - IFRService/TypedefDef_i.h \ - IFRService/UnionDef_i.h \ - IFRService/UsesDef_i.h \ + IFRService/IFR_Service_Loader.h \ + IFRService/IDLType_i.h \ + IFRService/ExtValueDef_i.h \ IFRService/ValueBoxDef_i.h \ - IFRService/ValueDef_i.h \ - IFRService/ValueMemberDef_i.h \ - IFRService/WstringDef_i.h \ + IFRService/NativeDef_i.h \ + IFRService/IRObject_i.h \ + IFRService/UsesDef_i.h \ + Channel_Clients_T.h \ IFRService/IFR_BaseS.i \ - IFRService/IFR_BasicS.i \ + IFRService/IFR_ExtendedS.i \ IFRService/IFR_ComponentsS.i \ - IFRService/IFR_ExtendedS.i - -endif !BUILD_MINIMUM_CORBA + IFRService/IFR_BasicS.i \ + Channel_Clients_T.i \ + Channel_Clients_T.cpp -EXTRA_DIST += \ - IFRService.rc ## Makefile.RTCORBAEvent.am -if BUILD_RT_CORBA - RTCORBAEvent = \ Event/EC_RTCORBA_Dispatching.cpp \ Event/EC_RTCORBA_Factory.cpp @@ -4161,8 +3538,6 @@ libTAO_RTCORBAEvent_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTCORBAEVENT_BUILD_DLL libTAO_RTCORBAEvent_la_SOURCES = \ @@ -4172,65 +3547,63 @@ libTAO_RTCORBAEvent_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTCORBAEvent_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - libTAO_CosNaming.la \ - libTAO_RTEvent.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + $(top_builddir)/tao/libTAO_RTPortableServer.la \ + $(top_builddir)/tao/libTAO_RTCORBA.la \ + libTAO_CosNaming.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + libTAO_RTEvent.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Channel_Clients_T.h \ Event/EC_RTCORBA_Dispatching.h \ Event/EC_RTCORBA_Factory.h \ + Channel_Clients_T.i \ Event/EC_RTCORBA_Dispatching.inl \ - Event/EC_RTCORBA_Factory.inl + Event/EC_RTCORBA_Factory.inl \ + Channel_Clients_T.cpp -endif BUILD_RT_CORBA ## Makefile.RTCosScheduling.am -if BUILD_RT_CORBA -if BUILD_INTERCEPTORS - BUILT_SOURCES += \ RTCosSchedulingS_T.cpp \ - RTCosSchedulingC.inl \ - RTCosSchedulingS.inl \ - RTCosSchedulingS_T.inl \ RTCosSchedulingC.cpp \ RTCosSchedulingS.cpp \ RTCosSchedulingC.h \ RTCosSchedulingS.h \ - RTCosSchedulingS_T.h + RTCosSchedulingS_T.h \ + RTCosSchedulingC.inl \ + RTCosSchedulingS.inl \ + RTCosSchedulingS_T.inl CLEANFILES += \ RTCosSchedulingS_T.cpp \ - RTCosSchedulingC.inl \ - RTCosSchedulingS.inl \ - RTCosSchedulingS_T.inl \ RTCosSchedulingC.cpp \ RTCosSchedulingS.cpp \ RTCosSchedulingC.h \ RTCosSchedulingS.h \ RTCosSchedulingS_T.h \ - RTCosScheduling-stamp - -RTCosSchedulingS_T.cpp RTCosSchedulingC.inl RTCosSchedulingS.inl RTCosSchedulingS_T.inl RTCosSchedulingC.cpp RTCosSchedulingS.cpp RTCosSchedulingC.h RTCosSchedulingS.h RTCosSchedulingS_T.h: RTCosScheduling-stamp + RTCosSchedulingC.inl \ + RTCosSchedulingS.inl \ + RTCosSchedulingS_T.inl -RTCosScheduling-stamp: $(srcdir)/RTCosScheduling.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=orbsvcs/RTCosScheduling/RTCosScheduling_export.h $(srcdir)/RTCosScheduling.idl - @touch $@ +RTCosSchedulingS_T.cpp RTCosSchedulingC.cpp RTCosSchedulingS.cpp RTCosSchedulingC.h RTCosSchedulingS.h RTCosSchedulingS_T.h RTCosSchedulingC.inl RTCosSchedulingS.inl RTCosSchedulingS_T.inl: RTCosScheduling.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling/RTCosScheduling_export.h $(srcdir)/RTCosScheduling.idl RTCosScheduling = \ + RTCosSchedulingC.cpp \ + RTCosSchedulingS.cpp \ RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp \ RTCosScheduling/RTCosScheduling_PCP_Manager.cpp \ - RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp \ - RTCosSchedulingC.cpp \ - RTCosSchedulingS.cpp + RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp lib_LTLIBRARIES += libTAO_RTCosScheduling.la @@ -4239,8 +3612,6 @@ libTAO_RTCosScheduling_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTCOSSCHEDULING_BUILD_DLL libTAO_RTCosScheduling_la_SOURCES = \ @@ -4250,76 +3621,72 @@ libTAO_RTCosScheduling_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTCosScheduling_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - RTCosScheduling/RTCosScheduling_ClientScheduler_i.h \ - RTCosScheduling/RTCosScheduling_PCP_Manager.h \ + $(top_builddir)/tao/libTAO_RTPortableServer.la \ + $(top_builddir)/tao/libTAO_RTCORBA.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ RTCosScheduling/RTCosScheduling_ServerScheduler_i.h \ + RTCosScheduling/RTCosScheduling_ClientScheduler_i.h \ RTCosSchedulingC.h \ RTCosSchedulingS.h \ + RTCosScheduling/RTCosScheduling_PCP_Manager.h \ RTCosSchedulingS_T.h \ - RTCosScheduling/RTCosScheduling_ClientScheduler_i.i \ - RTCosScheduling/RTCosScheduling_PCP_Manager.i \ RTCosScheduling/RTCosScheduling_ServerScheduler_i.i \ + RTCosScheduling/RTCosScheduling_ClientScheduler_i.i \ RTCosSchedulingC.inl \ RTCosSchedulingS.inl \ + RTCosScheduling/RTCosScheduling_PCP_Manager.i \ RTCosSchedulingS_T.inl \ - RTCosSchedulingS_T.cpp \ - RTCosScheduling.idl + RTCosSchedulingS_T.cpp -endif BUILD_INTERCEPTORS -endif BUILD_RT_CORBA ## Makefile.RTSched.am BUILT_SOURCES += \ RtecSchedulerS_T.cpp \ - RtecSchedulerC.inl \ - RtecSchedulerS.inl \ - RtecSchedulerS_T.inl \ RtecSchedulerC.cpp \ RtecSchedulerS.cpp \ RtecSchedulerC.h \ RtecSchedulerS.h \ - RtecSchedulerS_T.h + RtecSchedulerS_T.h \ + RtecSchedulerC.inl \ + RtecSchedulerS.inl \ + RtecSchedulerS_T.inl CLEANFILES += \ RtecSchedulerS_T.cpp \ - RtecSchedulerC.inl \ - RtecSchedulerS.inl \ - RtecSchedulerS_T.inl \ RtecSchedulerC.cpp \ RtecSchedulerS.cpp \ RtecSchedulerC.h \ RtecSchedulerS.h \ RtecSchedulerS_T.h \ - RtecScheduler-stamp - -RtecSchedulerS_T.cpp RtecSchedulerC.inl RtecSchedulerS.inl RtecSchedulerS_T.inl RtecSchedulerC.cpp RtecSchedulerS.cpp RtecSchedulerC.h RtecSchedulerS.h RtecSchedulerS_T.h: RtecScheduler-stamp + RtecSchedulerC.inl \ + RtecSchedulerS.inl \ + RtecSchedulerS_T.inl -RtecScheduler-stamp: $(srcdir)/RtecScheduler.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl - @touch $@ +RtecSchedulerS_T.cpp RtecSchedulerC.cpp RtecSchedulerS.cpp RtecSchedulerC.h RtecSchedulerS.h RtecSchedulerS_T.h RtecSchedulerC.inl RtecSchedulerS.inl RtecSchedulerS_T.inl: RtecScheduler.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h $(srcdir)/RtecScheduler.idl Sched = \ RtecSchedulerC.cpp \ RtecSchedulerS.cpp \ + Scheduler_Factory.cpp \ Runtime_Scheduler.cpp \ + Scheduler_Utilities.cpp \ + Sched/Reconfig_Sched_Utils.cpp \ Sched/Config_Scheduler.cpp \ Sched/DynSched.cpp \ - Sched/Reconfig_Sched_Utils.cpp \ Sched/Reconfig_Scheduler.cpp \ Sched/SchedEntry.cpp \ Sched/Scheduler.cpp \ Sched/Scheduler_Generic.cpp \ - Sched/Strategy_Scheduler.cpp \ - Scheduler_Factory.cpp \ - Scheduler_Utilities.cpp + Sched/Strategy_Scheduler.cpp lib_LTLIBRARIES += libTAO_RTSched.la @@ -4328,8 +3695,6 @@ libTAO_RTSched_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTSCHED_BUILD_DLL libTAO_RTSched_la_SOURCES = \ @@ -4339,46 +3704,51 @@ libTAO_RTSched_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTSched_la_LIBADD = \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - RtecSchedulerC.h \ - RtecSchedulerS.h \ - RtecSchedulerS_T.h \ + libTAO_CosNaming.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ Runtime_Scheduler.h \ Sched/Config_Scheduler.h \ - Sched/DynSched.h \ - Sched/Reconfig_Sched_Utils.h \ Sched/Reconfig_Scheduler.h \ - Sched/SchedEntry.h \ + Scheduler_Factory.h \ + Sched/Reconfig_Sched_Utils.h \ + RtecSchedulerC.h \ Sched/Scheduler.h \ + RtecSchedulerS.h \ + Scheduler_Utilities.h \ Sched/Scheduler_Generic.h \ + Sched/SchedEntry.h \ + Sched/DynSched.h \ Sched/Strategy_Scheduler.h \ - Scheduler_Factory.h \ - Scheduler_Utilities.h \ - RtecSchedulerC.inl \ - RtecSchedulerS.inl \ - RtecSchedulerS_T.inl \ + Channel_Clients_T.h \ + RtecSchedulerS_T.h \ Runtime_Scheduler.i \ Sched/Config_Scheduler.i \ - Sched/DynSched.i \ - Sched/Reconfig_Sched_Utils.i \ Sched/Reconfig_Scheduler.i \ - Sched/SchedEntry.i \ + Scheduler_Factory.i \ + Sched/Reconfig_Sched_Utils.i \ + RtecSchedulerC.inl \ Sched/Scheduler.i \ + RtecSchedulerS.inl \ + Scheduler_Utilities.i \ Sched/Scheduler_Generic.i \ + Sched/SchedEntry.i \ + Sched/DynSched.i \ Sched/Strategy_Scheduler.i \ - Scheduler_Factory.i \ - Scheduler_Utilities.i \ + Channel_Clients_T.i \ + RtecSchedulerS_T.inl \ RtecSchedulerS_T.cpp \ - RtecScheduler.idl + Channel_Clients_T.cpp -EXTRA_DIST += \ - RTSched.rc ## Makefile.RTOLDEvent.am @@ -4391,8 +3761,8 @@ RTOLDEvent = \ Event/Local_ESTypes.cpp \ Event/Memory_Pools.cpp \ Event/Module_Factory.cpp \ - Event/RT_Task.cpp \ Event/ReactorTask.cpp \ + Event/RT_Task.cpp \ Event/Timer_Module.cpp lib_LTLIBRARIES += libTAO_RTOLDEvent.la @@ -4402,8 +3772,6 @@ libTAO_RTOLDEvent_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTOLDEVENT_BUILD_DLL libTAO_RTOLDEvent_la_SOURCES = \ @@ -4413,78 +3781,78 @@ libTAO_RTOLDEvent_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTOLDEvent_la_LIBADD = \ - libTAO_RTSched.la \ - libTAO_CosNaming.la \ - libTAO_RTEvent.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + libTAO_RTSched.la \ + libTAO_CosNaming.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + libTAO_RTEvent.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Event/ReactorTask.h \ + Event/RT_Task.h \ Event/BCU.h \ Event/Dispatching_Modules.h \ - Event/Event_Channel.h \ - Event/Event_Manip.h \ - Event/GPlot_File.h \ Event/Local_ESTypes.h \ Event/Memory_Pools.h \ Event/Module_Factory.h \ - Event/RT_Task.h \ - Event/ReactorTask.h \ Event/Timer_Module.h \ + Event/GPlot_File.h \ + Event/Event_Channel.h \ + Event/Event_Manip.h \ + Channel_Clients_T.h \ + Event/RT_Task.i \ Event/Dispatching_Modules.i \ - Event/Event_Channel.i \ - Event/Event_Manip.i \ - Event/GPlot_File.i \ Event/Local_ESTypes.i \ Event/Memory_Pools.i \ - Event/RT_Task.i \ - Event/Timer_Module.i + Event/Timer_Module.i \ + Event/GPlot_File.i \ + Event/Event_Channel.i \ + Event/Event_Manip.i \ + Channel_Clients_T.i \ + Channel_Clients_T.cpp -EXTRA_DIST += \ - RTOldEvent.rc ## Makefile.RTEventLogAdmin.am BUILT_SOURCES += \ RTEventLogAdminS_T.cpp \ - RTEventLogAdminC.inl \ - RTEventLogAdminS.inl \ - RTEventLogAdminS_T.inl \ RTEventLogAdminC.cpp \ RTEventLogAdminS.cpp \ RTEventLogAdminC.h \ RTEventLogAdminS.h \ - RTEventLogAdminS_T.h + RTEventLogAdminS_T.h \ + RTEventLogAdminC.inl \ + RTEventLogAdminS.inl \ + RTEventLogAdminS_T.inl CLEANFILES += \ RTEventLogAdminS_T.cpp \ - RTEventLogAdminC.inl \ - RTEventLogAdminS.inl \ - RTEventLogAdminS_T.inl \ RTEventLogAdminC.cpp \ RTEventLogAdminS.cpp \ RTEventLogAdminC.h \ RTEventLogAdminS.h \ RTEventLogAdminS_T.h \ - RTEventLogAdmin-stamp - -RTEventLogAdminS_T.cpp RTEventLogAdminC.inl RTEventLogAdminS.inl RTEventLogAdminS_T.inl RTEventLogAdminC.cpp RTEventLogAdminS.cpp RTEventLogAdminC.h RTEventLogAdminS.h RTEventLogAdminS_T.h: RTEventLogAdmin-stamp + RTEventLogAdminC.inl \ + RTEventLogAdminS.inl \ + RTEventLogAdminS_T.inl -RTEventLogAdmin-stamp: $(srcdir)/RTEventLogAdmin.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=orbsvcs/Log/rteventlog_export.h $(srcdir)/RTEventLogAdmin.idl - @touch $@ +RTEventLogAdminS_T.cpp RTEventLogAdminC.cpp RTEventLogAdminS.cpp RTEventLogAdminC.h RTEventLogAdminS.h RTEventLogAdminS_T.h RTEventLogAdminC.inl RTEventLogAdminS.inl RTEventLogAdminS_T.inl: RTEventLogAdmin.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=Log/rteventlog_export.h $(srcdir)/RTEventLogAdmin.idl RTEventLog = \ - Log/RTEventLogConsumer.cpp \ + RTEventLogAdminC.cpp \ + RTEventLogAdminS.cpp \ Log/RTEventLogFactory_i.cpp \ - Log/RTEventLogNotification.cpp \ Log/RTEventLog_i.cpp \ - RTEventLogAdminC.cpp \ - RTEventLogAdminS.cpp + Log/RTEventLogConsumer.cpp \ + Log/RTEventLogNotification.cpp lib_LTLIBRARIES += libTAO_RTEventLogAdmin.la @@ -4493,8 +3861,6 @@ libTAO_RTEventLogAdmin_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTEVENTLOG_BUILD_DLL libTAO_RTEventLogAdmin_la_SOURCES = \ @@ -4504,35 +3870,37 @@ libTAO_RTEventLogAdmin_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTEventLogAdmin_la_LIBADD = \ - libTAO_DsLogAdmin_Serv.la \ - libTAO_ETCL.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - libTAO_DsLogAdmin_Skel.la \ - libTAO_DsLogAdmin.la \ - libTAO_RTOLDEvent.la \ - libTAO_RTSched.la \ - libTAO_RTEvent.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - Log/RTEventLogConsumer.h \ - Log/RTEventLogFactory_i.h \ + libTAO_DsLogAdmin.la \ + $(top_builddir)/tao/libTAO_DynamicAny.la \ + libTAO_ETCL.la \ + libTAO_RTOLDEvent.la \ + libTAO_RTSched.la \ + libTAO_RTEvent.la \ + libTAO_CosNaming.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Channel_Clients_T.h \ + RTEventLogAdminS_T.h \ Log/RTEventLogNotification.h \ Log/RTEventLog_i.h \ RTEventLogAdminC.h \ RTEventLogAdminS.h \ - RTEventLogAdminS_T.h \ - RTEventLogAdminC.inl \ - RTEventLogAdminS.inl \ + Log/RTEventLogConsumer.h \ + Log/RTEventLogFactory_i.h \ + Channel_Clients_T.i \ RTEventLogAdminS_T.inl \ RTEventLogAdminS_T.cpp \ - RTEventLogAdmin.idl + Channel_Clients_T.cpp + ## Makefile.RTKokyuEvent.am @@ -4550,8 +3918,6 @@ libTAO_RTKokyuEvent_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -I$(ACE_ROOT)/Kokyu \ -DTAO_RTKOKYUEVENT_BUILD_DLL @@ -4562,28 +3928,34 @@ libTAO_RTKokyuEvent_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTKokyuEvent_la_LIBADD = \ - -lKokyu \ - libTAO_RTSched.la \ - libTAO_CosNaming.la \ - libTAO_RTEvent.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + -lKokyu libTAO_RTSched.la \ + libTAO_CosNaming.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + libTAO_RTEvent.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Event/EC_Kokyu_Scheduling.h \ Event/EC_Kokyu_Dispatching.h \ - Event/EC_Kokyu_Factory.h \ Event/EC_Kokyu_Filter.h \ Event/EC_Kokyu_Filter_Builder.h \ - Event/EC_Kokyu_Scheduling.h \ + Event/EC_Kokyu_Factory.h \ + Channel_Clients_T.h \ + Event/EC_Kokyu_Scheduling.i \ Event/EC_Kokyu_Dispatching.i \ - Event/EC_Kokyu_Factory.i \ Event/EC_Kokyu_Filter.i \ Event/EC_Kokyu_Filter_Builder.i \ - Event/EC_Kokyu_Scheduling.i + Event/EC_Kokyu_Factory.i \ + Channel_Clients_T.i \ + Channel_Clients_T.cpp + ## Makefile.RTSchedEvent.am @@ -4602,8 +3974,6 @@ libTAO_RTSchedEvent_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_RTSCHEDEVENT_BUILD_DLL libTAO_RTSchedEvent_la_SOURCES = \ @@ -4613,37 +3983,38 @@ libTAO_RTSchedEvent_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTSchedEvent_la_LIBADD = \ - libTAO_RTSched.la \ - libTAO_CosNaming.la \ - libTAO_RTEvent.la \ - libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + libTAO_RTSched.la \ + libTAO_CosNaming.la \ + $(top_builddir)/tao/libTAO_IORTable.la \ + libTAO_RTEvent.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_Messaging.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Event/EC_Sched_Filter.h \ + Event/EC_Priority_Scheduling.h \ Event/EC_Gateway_Sched.h \ Event/EC_Priority_Dispatching.h \ - Event/EC_Priority_Scheduling.h \ Event/EC_Sched_Factory.h \ - Event/EC_Sched_Filter.h \ Event/EC_Sched_Filter_Builder.h \ - Event/EC_Priority_Dispatching.i \ + Channel_Clients_T.h \ + Event/EC_Sched_Filter.i \ Event/EC_Priority_Scheduling.i \ + Event/EC_Priority_Dispatching.i \ Event/EC_Sched_Factory.i \ - Event/EC_Sched_Filter.i \ - Event/EC_Sched_Filter_Builder.i + Event/EC_Sched_Filter_Builder.i \ + Channel_Clients_T.i \ + Channel_Clients_T.cpp -EXTRA_DIST += \ - RTSchedEvent.rc ## Makefile.RT_Notification.am -if BUILD_RT_CORBA -if !BUILD_MINIMUM_CORBA - RT_Notify = \ Notify/RT_Builder.cpp \ Notify/RT_Factory.cpp \ @@ -4659,9 +4030,6 @@ libTAO_RT_Notification_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_RT_NOTIFY_BUILD_DLL libTAO_RT_Notification_la_SOURCES = \ @@ -4671,264 +4039,231 @@ libTAO_RT_Notification_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RT_Notification_la_LIBADD = \ - libTAO_CosNotification_Serv.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - libTAO_ETCL.la \ - libTAO_CosNotification_Skel.la \ - libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - libTAO_CosNotification.la \ - libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ + libTAO_CosNotification.la \ + libTAO_ETCL.la \ + $(top_builddir)/tao/libTAO_RTCORBA.la \ + $(top_builddir)/tao/libTAO_DynamicAny.la \ + libTAO_Svc_Utils.la \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ + Channel_Clients_T.h \ Notify/RT_Builder.h \ + Notify/RT_POA_Helper.h \ Notify/RT_Factory.h \ Notify/RT_Notify_Service.h \ - Notify/RT_POA_Helper.h \ Notify/RT_Properties.h \ Notify/Structured/RT_StructuredProxyPushSupplier.h \ + Channel_Clients_T.i \ Notify/RT_Builder.inl \ + Notify/RT_POA_Helper.inl \ Notify/RT_Factory.inl \ Notify/RT_Notify_Service.inl \ - Notify/RT_POA_Helper.inl \ Notify/RT_Properties.inl \ - Notify/Structured/RT_StructuredProxyPushSupplier.inl + Notify/Structured/RT_StructuredProxyPushSupplier.inl \ + Channel_Clients_T.cpp -endif !BUILD_MINIMUM_CORBA -endif BUILD_RT_CORBA - -EXTRA_DIST += \ - RT_Notification.rc ## Makefile.Security.am -if BUILD_CORBA_MESSAGING -if BUILD_INTERCEPTORS - BUILT_SOURCES += \ CSIS_T.cpp \ - CSIC.inl \ - CSIS.inl \ - CSIS_T.inl \ CSIC.cpp \ CSIC.h \ CSIS.h \ - CSIS_T.h + CSIS_T.h \ + CSIC.inl \ + CSIS.inl \ + CSIS_T.inl CLEANFILES += \ CSIS_T.cpp \ - CSIC.inl \ - CSIS.inl \ - CSIS_T.inl \ CSIC.cpp \ CSIC.h \ CSIS.h \ CSIS_T.h \ - CSI-stamp - -CSIS_T.cpp CSIC.inl CSIS.inl CSIS_T.inl CSIC.cpp CSIC.h CSIS.h CSIS_T.h: CSI-stamp + CSIC.inl \ + CSIS.inl \ + CSIS_T.inl -CSI-stamp: $(srcdir)/CSI.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl - @touch $@ +CSIS_T.cpp CSIC.cpp CSIC.h CSIS.h CSIS_T.h CSIC.inl CSIS.inl CSIS_T.inl: CSI.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/CSI.idl BUILT_SOURCES += \ CSIIOPS_T.cpp \ - CSIIOPC.inl \ - CSIIOPS.inl \ - CSIIOPS_T.inl \ CSIIOPC.cpp \ CSIIOPC.h \ CSIIOPS.h \ - CSIIOPS_T.h + CSIIOPS_T.h \ + CSIIOPC.inl \ + CSIIOPS.inl \ + CSIIOPS_T.inl CLEANFILES += \ CSIIOPS_T.cpp \ - CSIIOPC.inl \ - CSIIOPS.inl \ - CSIIOPS_T.inl \ CSIIOPC.cpp \ CSIIOPC.h \ CSIIOPS.h \ CSIIOPS_T.h \ - CSIIOP-stamp - -CSIIOPS_T.cpp CSIIOPC.inl CSIIOPS.inl CSIIOPS_T.inl CSIIOPC.cpp CSIIOPC.h CSIIOPS.h CSIIOPS_T.h: CSIIOP-stamp + CSIIOPC.inl \ + CSIIOPS.inl \ + CSIIOPS_T.inl -CSIIOP-stamp: $(srcdir)/CSIIOP.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl - @touch $@ +CSIIOPS_T.cpp CSIIOPC.cpp CSIIOPC.h CSIIOPS.h CSIIOPS_T.h CSIIOPC.inl CSIIOPS.inl CSIIOPS_T.inl: CSIIOP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/CSIIOP.idl BUILT_SOURCES += \ GSSUPS_T.cpp \ - GSSUPC.inl \ - GSSUPS.inl \ - GSSUPS_T.inl \ GSSUPC.cpp \ GSSUPC.h \ GSSUPS.h \ - GSSUPS_T.h + GSSUPS_T.h \ + GSSUPC.inl \ + GSSUPS.inl \ + GSSUPS_T.inl CLEANFILES += \ GSSUPS_T.cpp \ - GSSUPC.inl \ - GSSUPS.inl \ - GSSUPS_T.inl \ GSSUPC.cpp \ GSSUPC.h \ GSSUPS.h \ GSSUPS_T.h \ - GSSUP-stamp - -GSSUPS_T.cpp GSSUPC.inl GSSUPS.inl GSSUPS_T.inl GSSUPC.cpp GSSUPC.h GSSUPS.h GSSUPS_T.h: GSSUP-stamp + GSSUPC.inl \ + GSSUPS.inl \ + GSSUPS_T.inl -GSSUP-stamp: $(srcdir)/GSSUP.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl - @touch $@ +GSSUPS_T.cpp GSSUPC.cpp GSSUPC.h GSSUPS.h GSSUPS_T.h GSSUPC.inl GSSUPS.inl GSSUPS_T.inl: GSSUP.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/GSSUP.idl BUILT_SOURCES += \ SecurityS_T.cpp \ - SecurityC.inl \ - SecurityS.inl \ - SecurityS_T.inl \ SecurityC.cpp \ SecurityS.cpp \ SecurityC.h \ SecurityS.h \ - SecurityS_T.h + SecurityS_T.h \ + SecurityC.inl \ + SecurityS.inl \ + SecurityS_T.inl CLEANFILES += \ SecurityS_T.cpp \ - SecurityC.inl \ - SecurityS.inl \ - SecurityS_T.inl \ SecurityC.cpp \ SecurityS.cpp \ SecurityC.h \ SecurityS.h \ SecurityS_T.h \ - Security-stamp - -SecurityS_T.cpp SecurityC.inl SecurityS.inl SecurityS_T.inl SecurityC.cpp SecurityS.cpp SecurityC.h SecurityS.h SecurityS_T.h: Security-stamp + SecurityC.inl \ + SecurityS.inl \ + SecurityS_T.inl -Security-stamp: $(srcdir)/Security.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl - @touch $@ +SecurityS_T.cpp SecurityC.cpp SecurityS.cpp SecurityC.h SecurityS.h SecurityS_T.h SecurityC.inl SecurityS.inl SecurityS_T.inl: Security.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/Security.idl BUILT_SOURCES += \ SecurityLevel1S_T.cpp \ - SecurityLevel1C.inl \ - SecurityLevel1S.inl \ - SecurityLevel1S_T.inl \ SecurityLevel1C.cpp \ SecurityLevel1S.cpp \ SecurityLevel1C.h \ SecurityLevel1S.h \ - SecurityLevel1S_T.h + SecurityLevel1S_T.h \ + SecurityLevel1C.inl \ + SecurityLevel1S.inl \ + SecurityLevel1S_T.inl CLEANFILES += \ SecurityLevel1S_T.cpp \ - SecurityLevel1C.inl \ - SecurityLevel1S.inl \ - SecurityLevel1S_T.inl \ SecurityLevel1C.cpp \ SecurityLevel1S.cpp \ SecurityLevel1C.h \ SecurityLevel1S.h \ SecurityLevel1S_T.h \ - SecurityLevel1-stamp - -SecurityLevel1S_T.cpp SecurityLevel1C.inl SecurityLevel1S.inl SecurityLevel1S_T.inl SecurityLevel1C.cpp SecurityLevel1S.cpp SecurityLevel1C.h SecurityLevel1S.h SecurityLevel1S_T.h: SecurityLevel1-stamp + SecurityLevel1C.inl \ + SecurityLevel1S.inl \ + SecurityLevel1S_T.inl -SecurityLevel1-stamp: $(srcdir)/SecurityLevel1.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl - @touch $@ +SecurityLevel1S_T.cpp SecurityLevel1C.cpp SecurityLevel1S.cpp SecurityLevel1C.h SecurityLevel1S.h SecurityLevel1S_T.h SecurityLevel1C.inl SecurityLevel1S.inl SecurityLevel1S_T.inl: SecurityLevel1.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/SecurityLevel1.idl BUILT_SOURCES += \ SecurityLevel2S_T.cpp \ - SecurityLevel2C.inl \ - SecurityLevel2S.inl \ - SecurityLevel2S_T.inl \ SecurityLevel2C.cpp \ SecurityLevel2S.cpp \ SecurityLevel2C.h \ SecurityLevel2S.h \ - SecurityLevel2S_T.h + SecurityLevel2S_T.h \ + SecurityLevel2C.inl \ + SecurityLevel2S.inl \ + SecurityLevel2S_T.inl CLEANFILES += \ SecurityLevel2S_T.cpp \ - SecurityLevel2C.inl \ - SecurityLevel2S.inl \ - SecurityLevel2S_T.inl \ SecurityLevel2C.cpp \ SecurityLevel2S.cpp \ SecurityLevel2C.h \ SecurityLevel2S.h \ SecurityLevel2S_T.h \ - SecurityLevel2-stamp - -SecurityLevel2S_T.cpp SecurityLevel2C.inl SecurityLevel2S.inl SecurityLevel2S_T.inl SecurityLevel2C.cpp SecurityLevel2S.cpp SecurityLevel2C.h SecurityLevel2S.h SecurityLevel2S_T.h: SecurityLevel2-stamp + SecurityLevel2C.inl \ + SecurityLevel2S.inl \ + SecurityLevel2S_T.inl -SecurityLevel2-stamp: $(srcdir)/SecurityLevel2.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl - @touch $@ +SecurityLevel2S_T.cpp SecurityLevel2C.cpp SecurityLevel2S.cpp SecurityLevel2C.h SecurityLevel2S.h SecurityLevel2S_T.h SecurityLevel2C.inl SecurityLevel2S.inl SecurityLevel2S_T.inl: SecurityLevel2.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/SecurityLevel2.idl BUILT_SOURCES += \ SecurityLevel3S_T.cpp \ - SecurityLevel3C.inl \ - SecurityLevel3S.inl \ - SecurityLevel3S_T.inl \ SecurityLevel3C.cpp \ SecurityLevel3C.h \ SecurityLevel3S.h \ - SecurityLevel3S_T.h + SecurityLevel3S_T.h \ + SecurityLevel3C.inl \ + SecurityLevel3S.inl \ + SecurityLevel3S_T.inl CLEANFILES += \ SecurityLevel3S_T.cpp \ - SecurityLevel3C.inl \ - SecurityLevel3S.inl \ - SecurityLevel3S_T.inl \ SecurityLevel3C.cpp \ SecurityLevel3C.h \ SecurityLevel3S.h \ SecurityLevel3S_T.h \ - SecurityLevel3-stamp - -SecurityLevel3S_T.cpp SecurityLevel3C.inl SecurityLevel3S.inl SecurityLevel3S_T.inl SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3S.h SecurityLevel3S_T.h: SecurityLevel3-stamp + SecurityLevel3C.inl \ + SecurityLevel3S.inl \ + SecurityLevel3S_T.inl -SecurityLevel3-stamp: $(srcdir)/SecurityLevel3.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl - @touch $@ +SecurityLevel3S_T.cpp SecurityLevel3C.cpp SecurityLevel3C.h SecurityLevel3S.h SecurityLevel3S_T.h SecurityLevel3C.inl SecurityLevel3S.inl SecurityLevel3S_T.inl: SecurityLevel3.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h $(srcdir)/SecurityLevel3.idl Security = \ CSIC.cpp \ CSIIOPC.cpp \ GSSUPC.cpp \ - Security/CSI_Utils.cpp \ + SecurityC.cpp \ + SecurityS.cpp \ + SecurityLevel1C.cpp \ + SecurityLevel1S.cpp \ + SecurityLevel2C.cpp \ + SecurityLevel2S.cpp \ + SecurityLevel3C.cpp \ Security/SL2_EstablishTrustPolicy.cpp \ Security/SL2_QOPPolicy.cpp \ - Security/SL3_ContextEstablishmentPolicy.cpp \ Security/SL3_CredentialsAcquirerFactory.cpp \ Security/SL3_CredentialsCurator.cpp \ - Security/SL3_ObjectCredentialsPolicy.cpp \ - Security/SL3_PolicyFactory.cpp \ - Security/SL3_SecurityCurrent.cpp \ - Security/SL3_SecurityCurrent_Impl.cpp \ - Security/SL3_SecurityManager.cpp \ - Security/Security_Current.cpp \ Security/Security_Current_Impl.cpp \ + Security/Security_Current.cpp \ Security/Security_ORBInitializer.cpp \ Security/Security_PolicyFactory.cpp \ - SecurityC.cpp \ - SecurityLevel1C.cpp \ - SecurityLevel1S.cpp \ - SecurityLevel2C.cpp \ - SecurityLevel2S.cpp \ - SecurityLevel3C.cpp \ - SecurityS.cpp + Security/CSI_Utils.cpp \ + Security/SL3_ContextEstablishmentPolicy.cpp \ + Security/SL3_ObjectCredentialsPolicy.cpp \ + Security/SL3_PolicyFactory.cpp \ + Security/SL3_SecurityManager.cpp \ + Security/SL3_SecurityCurrent.cpp \ + Security/SL3_SecurityCurrent_Impl.cpp lib_LTLIBRARIES += libTAO_Security.la @@ -4937,8 +4272,6 @@ libTAO_Security_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ -DTAO_SECURITY_BUILD_DLL libTAO_Security_la_SOURCES = \ @@ -4948,223 +4281,76 @@ libTAO_Security_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_Security_la_LIBADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CSIC.h \ - CSIIOPC.h \ - CSIIOPS_T.h \ - CSIS_T.h \ - GSSUPC.h \ - GSSUPS_T.h \ - Security/CSI_Utils.h \ - Security/SL2_EstablishTrustPolicy.h \ - Security/SL2_QOPPolicy.h \ - Security/SL3_ContextEstablishmentPolicy.h \ - Security/SL3_CredentialsAcquirerFactory.h \ - Security/SL3_CredentialsCurator.h \ + $(top_builddir)/tao/libTAO_PortableServer.la \ + $(top_builddir)/tao/libTAO_IORInterceptor.la \ + $(top_builddir)/tao/libTAO_ObjRefTemplate.la \ + $(top_builddir)/tao/libTAO_Valuetype.la \ + $(top_builddir)/tao/libTAO.la \ + $(top_builddir)/../ace/libACE.la + +noinst_HEADERS += \ Security/SL3_ObjectCredentialsPolicy.h \ - Security/SL3_PolicyFactory.h \ Security/SL3_SecurityCurrent.h \ - Security/SL3_SecurityCurrent_Impl.h \ Security/SL3_SecurityManager.h \ - Security/Security_Current.h \ - Security/Security_Current_Impl.h \ + SecurityC.h \ + Security/SL2_QOPPolicy.h \ + Security/SL3_CredentialsAcquirerFactory.h \ + SecurityS.h \ + Security/SL3_ContextEstablishmentPolicy.h \ + Security/SL2_EstablishTrustPolicy.h \ Security/Security_ORBInitializer.h \ + Security/SL3_SecurityCurrent_Impl.h \ + Security/SL3_PolicyFactory.h \ + Security/Security_Current.h \ Security/Security_PolicyFactory.h \ - SecurityC.h \ + CSIIOPC.h \ + CSIC.h \ + Security/Security_Current_Impl.h \ + GSSUPC.h \ SecurityLevel1C.h \ + Security/SL3_CredentialsCurator.h \ SecurityLevel1S.h \ - SecurityLevel1S_T.h \ + Security/CSI_Utils.h \ SecurityLevel2C.h \ SecurityLevel2S.h \ - SecurityLevel2S_T.h \ SecurityLevel3C.h \ SecurityLevel3S_T.h \ - SecurityS.h \ + SecurityLevel1S_T.h \ + GSSUPS_T.h \ + Channel_Clients_T.h \ SecurityS_T.h \ - CSIC.inl \ - CSIIOPC.inl \ - CSIIOPS_T.inl \ - CSIS_T.inl \ - GSSUPC.inl \ - GSSUPS_T.inl \ + SecurityLevel2S_T.h \ + CSIS_T.h \ + CSIIOPS_T.h \ Security/SL3_SecurityCurrent.inl \ - Security/Security_Current.inl \ SecurityC.inl \ + SecurityS.inl \ + Security/Security_Current.inl \ + CSIIOPC.inl \ + CSIC.inl \ + GSSUPC.inl \ SecurityLevel1C.inl \ SecurityLevel1S.inl \ - SecurityLevel1S_T.inl \ SecurityLevel2C.inl \ SecurityLevel2S.inl \ - SecurityLevel2S_T.inl \ SecurityLevel3C.inl \ SecurityLevel3S_T.inl \ - SecurityS.inl \ + SecurityLevel1S_T.inl \ + GSSUPS_T.inl \ + Channel_Clients_T.i \ SecurityS_T.inl \ - CSIIOPS_T.cpp \ + SecurityLevel2S_T.inl \ + CSIS_T.inl \ + CSIIOPS_T.inl \ CSIS_T.cpp \ + CSIIOPS_T.cpp \ GSSUPS_T.cpp \ + SecurityS_T.cpp \ SecurityLevel1S_T.cpp \ SecurityLevel2S_T.cpp \ SecurityLevel3S_T.cpp \ - SecurityS_T.cpp \ - CSI.idl \ - CSIIOP.idl \ - GSSUP.idl \ - Security.idl \ - SecurityLevel1.idl \ - SecurityLevel2.idl \ - SecurityLevel3.idl - -endif BUILD_INTERCEPTORS -endif BUILD_CORBA_MESSAGING - -EXTRA_DIST += \ - Security.rc - -## Makefile.SSLIOP.am - -if BUILD_INTERCEPTORS -if BUILD_CORBA_MESSAGING -if BUILD_SSL - -BUILT_SOURCES += \ - SSLIOPS_T.cpp \ - SSLIOPC.inl \ - SSLIOPS.inl \ - SSLIOPS_T.inl \ - SSLIOPC.cpp \ - SSLIOPC.h \ - SSLIOPS.h \ - SSLIOPS_T.h - -CLEANFILES += \ - SSLIOPS_T.cpp \ - SSLIOPC.inl \ - SSLIOPS.inl \ - SSLIOPS_T.inl \ - SSLIOPC.cpp \ - SSLIOPC.h \ - SSLIOPS.h \ - SSLIOPS_T.h \ - SSLIOP-stamp - -SSLIOPS_T.cpp SSLIOPC.inl SSLIOPS.inl SSLIOPS_T.inl SSLIOPC.cpp SSLIOPC.h SSLIOPS.h SSLIOPS_T.h: SSLIOP-stamp - -SSLIOP-stamp: $(srcdir)/SSLIOP.idl - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h $(srcdir)/SSLIOP.idl - @touch $@ - -SSLIOP = \ - SSLIOP/IIOP_SSL_Acceptor.cpp \ - SSLIOP/IIOP_SSL_Connection_Handler.cpp \ - SSLIOP/IIOP_SSL_Connector.cpp \ - SSLIOP/IIOP_SSL_Transport.cpp \ - SSLIOP/SSLIOP_Accept_Strategy.cpp \ - SSLIOP/SSLIOP_Acceptor.cpp \ - SSLIOP/SSLIOP_ClientCredentials.cpp \ - SSLIOP/SSLIOP_Connection_Handler.cpp \ - SSLIOP/SSLIOP_Connector.cpp \ - SSLIOP/SSLIOP_Credentials.cpp \ - SSLIOP/SSLIOP_CredentialsAcquirer.cpp \ - SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp \ - SSLIOP/SSLIOP_Current.cpp \ - SSLIOP/SSLIOP_Current_Impl.cpp \ - SSLIOP/SSLIOP_EVP_PKEY.cpp \ - SSLIOP/SSLIOP_Endpoint.cpp \ - SSLIOP/SSLIOP_Factory.cpp \ - SSLIOP/SSLIOP_Invocation_Interceptor.cpp \ - SSLIOP/SSLIOP_ORBInitializer.cpp \ - SSLIOP/SSLIOP_OwnCredentials.cpp \ - SSLIOP/SSLIOP_Profile.cpp \ - SSLIOP/SSLIOP_SSL.cpp \ - SSLIOP/SSLIOP_TargetCredentials.cpp \ - SSLIOP/SSLIOP_Transport.cpp \ - SSLIOP/SSLIOP_Util.cpp \ - SSLIOP/SSLIOP_X509.cpp \ - SSLIOP/ssl_endpoints.cpp \ - SSLIOPC.cpp - -lib_LTLIBRARIES += libTAO_SSLIOP.la - -libTAO_SSLIOP_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DACE_HAS_SSL=1 \ - -DTAO_SSLIOP_BUILD_DLL - -libTAO_SSLIOP_la_SOURCES = \ - $(SSLIOP) - -libTAO_SSLIOP_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + Channel_Clients_T.cpp -libTAO_SSLIOP_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ - libTAO_Security.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - SSLIOP/IIOP_SSL_Acceptor.h \ - SSLIOP/IIOP_SSL_Connection_Handler.h \ - SSLIOP/IIOP_SSL_Connector.h \ - SSLIOP/IIOP_SSL_Transport.h \ - SSLIOP/SSLIOP_Accept_Strategy.h \ - SSLIOP/SSLIOP_Acceptor.h \ - SSLIOP/SSLIOP_ClientCredentials.h \ - SSLIOP/SSLIOP_Connection_Handler.h \ - SSLIOP/SSLIOP_Connector.h \ - SSLIOP/SSLIOP_Credentials.h \ - SSLIOP/SSLIOP_CredentialsAcquirer.h \ - SSLIOP/SSLIOP_CredentialsAcquirerFactory.h \ - SSLIOP/SSLIOP_Current.h \ - SSLIOP/SSLIOP_Current_Impl.h \ - SSLIOP/SSLIOP_EVP_PKEY.h \ - SSLIOP/SSLIOP_Endpoint.h \ - SSLIOP/SSLIOP_Factory.h \ - SSLIOP/SSLIOP_Invocation_Interceptor.h \ - SSLIOP/SSLIOP_ORBInitializer.h \ - SSLIOP/SSLIOP_OwnCredentials.h \ - SSLIOP/SSLIOP_Profile.h \ - SSLIOP/SSLIOP_SSL.h \ - SSLIOP/SSLIOP_TargetCredentials.h \ - SSLIOP/SSLIOP_Transport.h \ - SSLIOP/SSLIOP_Util.h \ - SSLIOP/SSLIOP_X509.h \ - SSLIOP/ssl_endpoints.h \ - SSLIOPC.h \ - SSLIOPS_T.h \ - SSLIOP/IIOP_SSL_Connection_Handler.inl \ - SSLIOP/SSLIOP_Acceptor.i \ - SSLIOP/SSLIOP_Connection_Handler.i \ - SSLIOP/SSLIOP_Credentials.inl \ - SSLIOP/SSLIOP_Current.inl \ - SSLIOP/SSLIOP_Current_Impl.inl \ - SSLIOP/SSLIOP_Endpoint.i \ - SSLIOP/SSLIOP_Profile.i \ - SSLIOP/ssl_endpoints.i \ - SSLIOPC.inl \ - SSLIOPS_T.inl \ - SSLIOPS_T.cpp \ - SSLIOP.idl - -endif BUILD_SSL -endif BUILD_CORBA_MESSAGING -endif BUILD_INTERCEPTORS - -EXTRA_DIST += \ - SSLIOP.rc ## Clean up template repositories, etc. clean-local: diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h index 26f4d5703b3..68cfe397c9a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h @@ -23,8 +23,8 @@ #include "ace/SString.h" -#include "orbsvcs/CosNamingC.h" -#include "naming_serv_export.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "naming_export.h" /** * @class TAO_IntId @@ -38,7 +38,7 @@ * they can be stored together as a <value> for a <key> in a * hash table holding the state of a Transient Naming Context. */ -class TAO_Naming_Serv_Export TAO_IntId +class TAO_Naming_Export TAO_IntId { public: // = Initialization and termination methods. @@ -79,7 +79,7 @@ public: * they can be stored together as a <key> for a <value> in a * hash table holding the state of a Transient Naming Context. */ -class TAO_Naming_Serv_Export TAO_ExtId +class TAO_Naming_Export TAO_ExtId { public: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp index d9fa7b9369f..8f093465ffe 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp @@ -30,7 +30,7 @@ void TAO_NS_FlatFileStream::remove () { ACE_TRACE("remove"); - ACE_OS::unlink(ACE_TEXT_CHAR_TO_TCHAR(file_.c_str())); + ACE_OS::unlink(file_.c_str()); } int @@ -58,21 +58,21 @@ TAO_NS_FlatFileStream::open() if( strchr(mode_.c_str(), 'c') ) flags |= O_CREAT; #ifndef ACE_WIN32 - if( ACE_OS::flock_init (&filelock_, flags, ACE_TEXT_CHAR_TO_TCHAR(file_.c_str()), 0666) != 0 ) + if( ACE_OS::flock_init (&filelock_, flags, file_.c_str(), 0666) != 0 ) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open file %s for mode %s: (%d) %s\n", file_.c_str(), mode_.c_str(), errno, ACE_OS::strerror(errno)), -1); #else - if( (filelock_.handle_= ACE_OS::open (ACE_TEXT_CHAR_TO_TCHAR(file_.c_str()), flags, 0)) == ACE_INVALID_HANDLE ) + if( (filelock_.handle_= ACE_OS::open (file_.c_str(), flags, 0)) == ACE_INVALID_HANDLE ) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open file %s for mode %s: (%d) %s\n", file_.c_str(), mode_.c_str(), errno, ACE_OS::strerror(errno)), -1); #endif - this->fl_ = ACE_OS::fdopen(filelock_.handle_, ACE_TEXT_CHAR_TO_TCHAR(fdmode)); + this->fl_ = ACE_OS::fdopen(filelock_.handle_, fdmode); if (this->fl_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot fdopen file %s for mode %s: (%d) %s\n", @@ -89,10 +89,9 @@ TAO_NS_FlatFileStream::close() ACE_OS::fflush(fl_); #ifndef ACE_WIN32 ACE_OS::flock_destroy (&filelock_, 0); +#else + ACE_OS::fclose (fl_); #endif - ACE_OS::fclose (fl_); // even though flock_destroy closes the handle - // we still need to destroy the FILE* - fl_ = 0; return 0; } @@ -134,11 +133,7 @@ TAO_NS_FlatFileStream::last_changed(void) ACE_TRACE("TAO_NS_FlatFileStream::last_changed"); ACE_stat st; ACE_OS::fstat(filelock_.handle_, &st); -#if !defined (ACE_HAS_WINCE) return st.st_mtime; -#else - return st.st_mtime.sec (); -#endif /* ACE_HAS_WINCE */ } TAO_Storable_Base & @@ -181,15 +176,15 @@ TAO_NS_FlatFileStream::operator <<( ACE_OS::fprintf(this->fl_, "%d\n", type); ACE_CString id = record.id(); - ACE_OS::fprintf(this->fl_, ACE_TEXT_ALWAYS_CHAR(ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n"), + ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n", id.length(), id.c_str()); ACE_CString kind = record.kind(); - ACE_OS::fprintf(this->fl_, ACE_TEXT_ALWAYS_CHAR(ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n"), + ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n", kind.length(), kind.c_str()); ACE_CString ref = record.ref(); - ACE_OS::fprintf(this->fl_, ACE_TEXT_ALWAYS_CHAR(ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n"), + ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER "\n%s\n", ref.length(), ref.c_str()); ACE_OS::fflush(this->fl_); @@ -215,7 +210,7 @@ TAO_NS_FlatFileStream::operator >>( char *id = new char[bufSize+1]; //char *id; //ACE_NEW_RETURN (id, char[bufSize+1], 1); - ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(id), bufSize+1, fl_); + ACE_OS::fgets(id, bufSize+1, fl_); ACE_CString newId(id); record.id(newId); delete [] id; @@ -225,7 +220,7 @@ TAO_NS_FlatFileStream::operator >>( char *kind = new char[bufSize+1]; //char *kind; //ACE_NEW (kind, char[bufSize+1]); - ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(kind), bufSize+1, fl_); + ACE_OS::fgets(kind, bufSize+1, fl_); kind[bufSize] = '\0'; ACE_CString newKind(kind); record.kind(newKind); @@ -236,7 +231,7 @@ TAO_NS_FlatFileStream::operator >>( char *ref = new char[bufSize+1]; //char *ref; //ACE_NEW(ref, char[bufSize+1]); - ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(ref), bufSize+1, fl_); + ACE_OS::fgets(ref, bufSize+1, fl_); ACE_CString newRef(ref); record.ref(newRef); delete [] ref; @@ -281,7 +276,7 @@ TAO_Storable_Base *TAO_NS_FlatFileFactory::create_stream( TAO_Storable_Base *stream = 0; ACE_NEW_RETURN (stream, - TAO_NS_FlatFileStream(file, ACE_TEXT_ALWAYS_CHAR(mode)), + TAO_NS_FlatFileStream(file, mode), 0); return stream; } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index d3853190a0c..e8679086071 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" #include "Naming_Context_Interface.h" -#include "naming_serv_export.h" +#include "naming_export.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/SString.h" @@ -46,7 +46,7 @@ * that we can write some code that would work with any of them, * i.e., TAO_Hash_Naming_Context. */ -class TAO_Naming_Serv_Export TAO_Bindings_Map +class TAO_Naming_Export TAO_Bindings_Map { public: @@ -111,7 +111,7 @@ public: * class TAO_Bindings_Map, which provides a common interface to the data structures * used in TAO_Persistent_Namng_Context and TAO_Transient_Naming_Context. */ -class TAO_Naming_Serv_Export TAO_Hash_Naming_Context :public TAO_Naming_Context_Impl +class TAO_Naming_Export TAO_Hash_Naming_Context :public TAO_Naming_Context_Impl { public: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Makefile.am b/TAO/orbsvcs/orbsvcs/Naming/Makefile.am new file mode 100644 index 00000000000..65f3bb1b56d --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Naming/Makefile.am @@ -0,0 +1,42 @@ +##--------------------------------------------------------------------------- +## $Id$ +## +## Makefile for TAO's Naming Service library +## +##--------------------------------------------------------------------------- + +## +## Process this file with automake to create Makefile.in +## + +## The number in AUTOMAKE_OPTIONS is the minimum required version automake +## needed to process this file. +AUTOMAKE_OPTIONS = 1.4 + +INCLUDES = -I$(top_builddir) -I$(top_srcdir) + +lib_LTLIBRARIES = libTAO_Naming.la + +libTAO_Naming_la_LDADD = \ + $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la + +libTAO_Naming_la_SOURCES = \ + Entries.cpp \ + Hash_Naming_Context.cpp \ + Naming_Context.cpp \ + Naming_Utils.cpp + +noinst_HEADERS = \ + Entries.h \ + Hash_Naming_Context.h \ + Naming_Context.h \ + Naming_Utils.h + +EXTRA_DIST = README + +## Clean up some additional files/directories possibly created during +## the configure script tests. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations + diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index d3b4db2c3bd..e500888109e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -15,9 +15,9 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosNamingS.h" +#include "orbsvcs/orbsvcs/CosNamingS.h" -#include "naming_serv_export.h" +#include "naming_export.h" #include "ace/Null_Mutex.h" class TAO_Naming_Context_Impl; @@ -41,7 +41,7 @@ class TAO_Naming_Context_Impl; * concrete implementors. */ -class TAO_Naming_Serv_Export TAO_Naming_Context : +class TAO_Naming_Export TAO_Naming_Context : public virtual PortableServer::RefCountServantBase, public virtual POA_CosNaming::NamingContextExt { @@ -304,7 +304,7 @@ protected: * Subclasses of TAO_Naming_Context_Impl provide concrete * implementations of the NamingContext functionality. */ -class TAO_Naming_Serv_Export TAO_Naming_Context_Impl +class TAO_Naming_Export TAO_Naming_Context_Impl { public: diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index a5eee0e0f33..c2cb0964d12 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -90,7 +90,7 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, return 0; } -ACE_FACTORY_DEFINE (TAO_Naming_Serv, TAO_Naming_Loader) +ACE_FACTORY_DEFINE (TAO_Naming, TAO_Naming_Loader) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Dynamic_Service<TAO_Naming_Loader>; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h index 4e34848a46d..624b0a15949 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h @@ -22,9 +22,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Naming/Naming_Server.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" -class TAO_Naming_Serv_Export TAO_Naming_Loader : public TAO_Object_Loader +class TAO_Naming_Export TAO_Naming_Loader : public TAO_Object_Loader { public: @@ -60,6 +60,6 @@ private: ACE_UNIMPLEMENTED_FUNC (TAO_Naming_Loader &operator = (const TAO_Naming_Loader &)) }; -ACE_FACTORY_DECLARE (TAO_Naming_Serv, TAO_Naming_Loader) +ACE_FACTORY_DECLARE (TAO_Naming, TAO_Naming_Loader) #endif /* TAO_NAMING_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp new file mode 100644 index 00000000000..29c50161624 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp @@ -0,0 +1,783 @@ +// $Id$ + +#include "Naming_Utils.h" +#include "Transient_Naming_Context.h" +#include "Persistent_Context_Index.h" +#include "Storable_Naming_Context.h" +#include "Storable_Naming_Context_Activator.h" +#include "Flat_File_Persistence.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" + +#include "tao/debug.h" +#include "tao/default_ports.h" +#include "tao/ORB_Core.h" + +#include "tao/IORTable/IORTable.h" +#include "tao/Messaging/Messaging.h" + +#include "ace/Arg_Shifter.h" +#include "ace/Auto_Ptr.h" +#include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" + +ACE_RCSID (Naming, + Naming_Utils, + "$Id$") + +TAO_Naming_Server::TAO_Naming_Server (void) + : naming_context_ (), + ior_multicast_ (0), + naming_service_ior_ (), + context_index_ (0), + ior_output_file_ (0), + pid_file_name_ (0), + context_size_ (ACE_DEFAULT_MAP_SIZE), + persistence_file_name_ (0), + base_address_ (TAO_NAMING_BASE_ADDR), + multicast_ (0), + use_storable_context_ (0), + use_servant_activator_ (0), + use_redundancy_(0), + round_trip_timeout_ (0), + use_round_trip_timeout_ (0) +{ +} + +TAO_Naming_Server::TAO_Naming_Server (CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + size_t context_size, + ACE_Time_Value *timeout, + int resolve_for_existing_naming_service, + const ACE_TCHAR *persistence_location, + void *base_addr, + int enable_multicast, + int use_storable_context, + int round_trip_timeout, + int use_round_trip_timeout) + : naming_context_ (), + ior_multicast_ (0), + naming_service_ior_ (), + context_index_ (0), + ior_output_file_ (0), + pid_file_name_ (0), + context_size_ (ACE_DEFAULT_MAP_SIZE), + persistence_file_name_ (0), + base_address_ (TAO_NAMING_BASE_ADDR), + multicast_ (0), + use_storable_context_ (use_storable_context), + use_servant_activator_ (0), + use_redundancy_(0), + round_trip_timeout_ (0), + use_round_trip_timeout_ (0) +{ + if (this->init (orb, + poa, + context_size, + timeout, + resolve_for_existing_naming_service, + persistence_location, + base_addr, + enable_multicast, + use_storable_context, + round_trip_timeout, + use_round_trip_timeout) == -1) + ACE_ERROR ((LM_ERROR, + "(%P|%t) %p\n", + "TAO_Naming_Server::init")); +} + + +int +TAO_Naming_Server::init (CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + size_t context_size, + ACE_Time_Value *timeout, + int resolve_for_existing_naming_service, + const ACE_TCHAR *persistence_location, + void *base_addr, + int enable_multicast, + int use_storable_context, + int round_trip_timeout, + int use_round_trip_timeout) +{ + if (resolve_for_existing_naming_service) + { + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + // Try to find an existing Naming Service. + CORBA::Object_var naming_obj = + orb->resolve_initial_references ("NameService", + timeout + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (!CORBA::is_nil (naming_obj.in ())) + { + // + // Success in finding a Naming Service. + // + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "\nNameService found!\n")); + + this->naming_context_ = + CosNaming::NamingContext::_narrow (naming_obj.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + this->naming_service_ior_ = + orb->object_to_string (naming_obj.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + return 0; + } + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server::init"); + } + ACE_ENDTRY; + ACE_CHECK_RETURN (-1); + } + + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "\nWe'll become a NameService\n")); + + // Become a Naming Service. + return this->init_new_naming (orb, + poa, + persistence_location, + base_addr, + context_size, + enable_multicast, + use_storable_context, + round_trip_timeout, + use_round_trip_timeout); +} + +int +TAO_Naming_Server::parse_args (int argc, + ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_LIB_TEXT("b:do:p:s:f:m:u:r:z:")); + + int c; + int size, result; + + // This is declared this way to avoid warnings from + // some compilers that complain about mismatching types + // in the sscanf. +#if ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG + ptrdiff_t address; +#else + long int address; +#endif /* ACE_SIZEOF_VOID_P */ + + // Make sure only one persistence option is specified + int f_opt_used = 0; + int u_opt_used = 0; + int r_opt_used = 0; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'd': // debug flag. + TAO_debug_level++; + break; + case 'o': // outputs the naming service ior to a file. + this->ior_output_file_ = + ACE_OS::fopen (get_opts.opt_arg (), ACE_LIB_TEXT("w")); + + if (this->ior_output_file_ == 0) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_LIB_TEXT("Unable to open %s for writing:(%u) %p\n"), + get_opts.opt_arg(), errno, ACE_LIB_TEXT("TAO_Naming_Server::parse_args()")), -1); + break; + case 'p': + this->pid_file_name_ = get_opts.opt_arg (); + break; + case 's': + size = ACE_OS::atoi (get_opts.opt_arg ()); + if (size >= 0) + this->context_size_ = size; + break; + case 'b': + result = ::sscanf (ACE_TEXT_ALWAYS_CHAR (get_opts.opt_arg ()), +#if ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG + ACE_INT64_FORMAT_SPECIFIER, +#else + "%ld", +#endif /* ACE_SIZEOF_VOID_P */ + &address); + if (result == 0 || result == EOF) + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to process <-b> option"), + -1); + this->base_address_ = (void *) address; + break; + case 'm': + this->multicast_ = ACE_OS::atoi(get_opts.opt_arg ()); + break; + case 'f': + this->persistence_file_name_ = get_opts.opt_arg (); + f_opt_used = 1; + break; + case 'r': + this->use_redundancy_ = 1; + this->use_storable_context_ = 1; + this->persistence_file_name_ = get_opts.opt_arg (); + r_opt_used = 1; + break; + case 'u': + this->use_storable_context_ = 1; + this->persistence_file_name_ = get_opts.opt_arg (); + u_opt_used = 1; + break; + case 'z': + this->use_round_trip_timeout_ = 1; + this->round_trip_timeout_ = (int)1.0e7 * ACE_OS::atoi (get_opts.opt_arg ()); + break; + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + ACE_LIB_TEXT ("usage: %s ") + ACE_LIB_TEXT ("-d ") + ACE_LIB_TEXT ("-o <ior_output_file> ") + ACE_LIB_TEXT ("-p <pid_file_name> ") + ACE_LIB_TEXT ("-s <context_size> ") + ACE_LIB_TEXT ("-b <base_address> ") + ACE_LIB_TEXT ("-m <1=enable multicast, 0=disable multicast(default) ") + ACE_LIB_TEXT ("-f <persistence_file_name> ") + ACE_LIB_TEXT ("-u <storable_persistence_directory (not used with -f)> ") + ACE_LIB_TEXT ("-r <redundant_persistence_directory> ") + ACE_LIB_TEXT ("-z <relative round trip timeout> ") + ACE_LIB_TEXT ("\n"), + argv [0]), + -1); + } + + if (f_opt_used + u_opt_used + r_opt_used > 1) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_LIB_TEXT ("Only one persistence option can be passed") + ACE_LIB_TEXT ("\n")), + -1); + + return 0; +} + +int +TAO_Naming_Server::init_with_orb (int argc, + ACE_TCHAR *argv [], + CORBA::ORB_ptr orb) +{ + int result; + + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + // Duplicate the ORB + this->orb_ = CORBA::ORB::_duplicate (orb); + + // Get the POA from the ORB. + CORBA::Object_var poa_object = + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (CORBA::is_nil (poa_object.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_LIB_TEXT(" (%P|%t) Unable to initialize the POA.\n")), + -1); + } + + // Check the non-ORB arguments. this needs to come before we + // initialize my_naming_server so that we can pass on some of + // the command-line arguments. + result = this->parse_args (argc, argv); + + if (result < 0) + return result; + + // Get the POA object. + this->root_poa_ = PortableServer::POA::_narrow (poa_object.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + // Get the POA_Manager. + PortableServer::POAManager_var poa_manager = + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + int numPolicies = 2; +#if (TAO_HAS_MINIMUM_POA == 0) + if (this->use_storable_context_) + { + this->use_servant_activator_ = 1; + } + + if (this->use_servant_activator_) { + numPolicies += 2; + } +#endif /* TAO_HAS_MINIMUM_POA */ + + CORBA::PolicyList policies (numPolicies); + policies.length (numPolicies); + + // Id Assignment policy + policies[0] = + this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + // Lifespan policy + policies[1] = + this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + +#if (TAO_HAS_MINIMUM_POA == 0) + if (this->use_servant_activator_) + { + // Request Processing Policy + policies[2] = + this->root_poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER + ACE_ENV_ARG_PARAMETER); + + // Servant Retention Policy + policies[3] = + this->root_poa_->create_servant_retention_policy (PortableServer::RETAIN + ACE_ENV_ARG_PARAMETER); + } +#endif /* TAO_HAS_MINIMUM_POA */ + + // We use a different POA, otherwise the user would have to change + // the object key each time it invokes the server. + this->ns_poa_ = this->root_poa_->create_POA ("NameService", + poa_manager.in (), + policies + ACE_ENV_ARG_PARAMETER); + // Warning! If create_POA fails, then the policies won't be + // destroyed and there will be hell to pay in memory leaks! + ACE_TRY_CHECK; + + // Creation of the new POAs over, so destroy the Policy_ptr's. + for (CORBA::ULong i = 0; + i < policies.length (); + ++i) + { + CORBA::Policy_ptr policy = policies[i]; + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + } + + result = this->init (orb, + this->ns_poa_.in (), + this->context_size_, + 0, + 0, + this->persistence_file_name_, + this->base_address_, + this->multicast_, + this->use_storable_context_, + this->round_trip_timeout_, + this->use_round_trip_timeout_); + if (result == -1) + return result; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Service::init"); + return -1; + } + ACE_ENDTRY; + ACE_CHECK_RETURN (-1); + + if (this->ior_output_file_ != 0) + { + CORBA::String_var str = + this->naming_service_ior (); + ACE_OS::fprintf (this->ior_output_file_, + "%s", + str.in ()); + ACE_OS::fclose (this->ior_output_file_); + } + + if (this->pid_file_name_ != 0) + { + FILE *pidf = ACE_OS::fopen (this->pid_file_name_, ACE_LIB_TEXT("w")); + if (pidf != 0) + { + ACE_OS::fprintf (pidf, + "%ld\n", + ACE_static_cast (long, ACE_OS::getpid ())); + ACE_OS::fclose (pidf); + } + } + return 0; +} + +int +TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + const ACE_TCHAR *persistence_location, + void *base_addr, + size_t context_size, + int enable_multicast, + int use_storable_context, + int round_trip_timeout, + int use_round_trip_timeout) +{ + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + if (use_storable_context) + { + // In lieu of a fully implemented service configurator version + // of this Reader and Writer, let's just take something off the + // command line for now. + TAO_Naming_Service_Persistence_Factory *persFactory = 0; + ACE_NEW_RETURN(persFactory, TAO_NS_FlatFileFactory, -1); + + // Was a location specified? + if (persistence_location == 0) + { + // No, assign the default location "NameService" + persistence_location = ACE_LIB_TEXT("NameService"); + } + + // Now make sure this directory exists + if (ACE_OS::access (persistence_location, W_OK|X_OK)) + { + ACE_ERROR ((LM_ERROR, "Invalid persistence directory\n")); + return -1; + } + +#if (TAO_HAS_MINIMUM_POA == 0) + if (this->use_servant_activator_) + { + TAO_Storable_Naming_Context_Activator *servant_activator; + ACE_NEW_THROW_EX (servant_activator, + TAO_Storable_Naming_Context_Activator (orb, + persFactory, + persistence_location, + context_size), + CORBA::NO_MEMORY ()); + this->ns_poa_->set_servant_manager(servant_activator); + } +#endif /* TAO_HAS_MINIMUM_POA */ + + this->naming_context_ = + TAO_Storable_Naming_Context::recreate_all (orb, + poa, + TAO_ROOT_NAMING_CONTEXT, + context_size, + 0, + persFactory, + persistence_location, + use_redundancy_ + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + else if (persistence_location != 0) + // + // Initialize Persistent Naming Service. + // + { + // Allocate and initialize Persistent Context Index. + ACE_NEW_RETURN (this->context_index_, + TAO_Persistent_Context_Index (orb, poa), + -1); + + if (this->context_index_->open (persistence_location, + base_addr) == -1 + || this->context_index_->init (context_size) == -1) + { + if (TAO_debug_level >0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Naming_Server: context_index initialization failed\n")); + return -1; + } + + // Set the root Naming Context reference. + this->naming_context_ = + this->context_index_->root_context (); + } + else + { + // + // Initialize Transient Naming Service. + // + this->naming_context_ = + TAO_Transient_Naming_Context::make_new_context (poa, + TAO_ROOT_NAMING_CONTEXT, + context_size + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + } + + // Set the ior of the root Naming Context. + this->naming_service_ior_= + orb->object_to_string (this->naming_context_.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + CORBA::Object_var table_object = + orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + IORTable::Table_var adapter = + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + if (CORBA::is_nil (adapter.in ())) + { + ACE_ERROR ((LM_ERROR, "Nil IORTable\n")); + } + else + { + CORBA::String_var ior = + orb->object_to_string (this->naming_context_.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + adapter->bind ("NameService", ior.in () ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + +#if defined (ACE_HAS_IP_MULTICAST) + if (enable_multicast) + { + // @@ Marina: is there anyway to implement this stuff + // without using ORB_Core_instance()? For example can you + // pass the ORB as an argument? + + // + // Install ior multicast handler. + // + // Get reactor instance from TAO. + ACE_Reactor *reactor = + TAO_ORB_Core_instance ()->reactor (); + + // See if the -ORBMulticastDiscoveryEndpoint option was specified. + ACE_CString mde (TAO_ORB_Core_instance ()->orb_params () + ->mcast_discovery_endpoint ()); + + // First, see if the user has given us a multicast port number + // on the command-line; + u_short port = + TAO_ORB_Core_instance ()->orb_params ()->service_port (NAMESERVICE); + + if (port == 0) + { + // Check environment var. for multicast port. + const char *port_number = + ACE_OS::getenv ("NameServicePort"); + + if (port_number != 0) + port = ACE_static_cast (u_short, ACE_OS::atoi (port_number)); + } + + // Port wasn't specified on the command-line or in environment - + // use the default. + if (port == 0) + port = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT; + + // Instantiate a handler which will handle client requests for + // the root Naming Context ior, received on the multicast port. + ACE_NEW_RETURN (this->ior_multicast_, + TAO_IOR_Multicast (), + -1); + + if (mde.length () != 0) + { + if (this->ior_multicast_->init (this->naming_service_ior_.in (), + mde.c_str (), + TAO_SERVICEID_NAMESERVICE) == -1) + return -1; + } + else + { + if (this->ior_multicast_->init (this->naming_service_ior_.in (), + port, + ACE_DEFAULT_MULTICAST_ADDR, + TAO_SERVICEID_NAMESERVICE) == -1) + return -1; + } + + // Register event handler for the ior multicast. + if (reactor->register_handler (this->ior_multicast_, + ACE_Event_Handler::READ_MASK) == -1) + { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Naming_Server: cannot register Event handler\n")); + return -1; + } + + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_Naming_Server: The multicast server setup is done.\n")); + } +#else + ACE_UNUSED_ARG (enable_multicast); +#endif /* ACE_HAS_IP_MULTICAST */ + + if (use_round_trip_timeout == 1) + { + TimeBase::TimeT roundTripTimeoutVal = round_trip_timeout; + CORBA::Any anyObjectVal; + anyObjectVal <<= roundTripTimeoutVal; + CORBA::PolicyList polList (1); + polList.length (1); + polList[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, + anyObjectVal); + ACE_TRY_CHECK; + + // set a timeout on the orb + // + CORBA::Object_var orbPolicyManagerObj = + orb->resolve_initial_references ("ORBPolicyManager" + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + CORBA::PolicyManager_var orbPolicyManager = + CORBA::PolicyManager::_narrow (orbPolicyManagerObj.in ()); + ACE_TRY_CHECK; + orbPolicyManager->set_policy_overrides (polList, CORBA::SET_OVERRIDE); + + polList[0]->destroy (); + ACE_TRY_CHECK; + polList[0] = CORBA::Policy::_nil (); + } + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server"); + return -1; + } + ACE_ENDTRY; + ACE_CHECK_RETURN (-1); + + return 0; +} + +int +TAO_Naming_Server::fini (void) +{ + // Destroy the child POA ns_poa that is created when initializing + // the Naming Service + ACE_TRY_NEW_ENV + { + this->ns_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + + CORBA::Object_var table_object = + this->orb_->resolve_initial_references ("IORTable" + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + IORTable::Table_var adapter = + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + if (CORBA::is_nil (adapter.in ())) + { + ACE_ERROR ((LM_ERROR, "Nil IORTable\n")); + } + else + { + adapter->unbind ("NameService" ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + } + ACE_CATCHANY + { + // Ignore + } + ACE_ENDTRY; + return 0; +} + +char* +TAO_Naming_Server::naming_service_ior (void) +{ + return CORBA::string_dup (this->naming_service_ior_.in ()); +} + +CosNaming::NamingContext_ptr +TAO_Naming_Server::operator-> (void) const +{ + return this->naming_context_.ptr (); +} + +TAO_Naming_Server::~TAO_Naming_Server (void) +{ + if (this->ior_multicast_ != 0) + { + TAO_ORB_Core_instance ()->reactor ()->remove_handler + (this->ior_multicast_, + ACE_Event_Handler::READ_MASK | ACE_Event_Handler::DONT_CALL); + delete this->ior_multicast_; + } + delete context_index_; +} + + +CosNaming::NamingContext_ptr +TAO_Naming_Client::operator -> (void) const +{ + return this->naming_context_.ptr (); +} + +CosNaming::NamingContext_ptr +TAO_Naming_Client::get_context (void) const +{ + // Must duplicate this pointer so it can be stored in a _var. + return CosNaming::NamingContext::_duplicate (this->naming_context_.ptr ()); +} + +int +TAO_Naming_Client::init (CORBA::ORB_ptr orb, + ACE_Time_Value *timeout) +{ + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + CORBA::Object_var naming_obj = + orb->resolve_initial_references ("NameService", timeout ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + if (CORBA::is_nil (naming_obj.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Unable to initialize the NameService.\n"), + -1); + this->naming_context_ = + CosNaming::NamingContext::_narrow (naming_obj.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init"); + return -1; + } + ACE_ENDTRY; + ACE_CHECK_RETURN (-1); + + return 0; +} + +TAO_Naming_Client::TAO_Naming_Client (void) +{ + // Do nothing +} + +TAO_Naming_Client::~TAO_Naming_Client (void) +{ + // Do nothing +} diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h new file mode 100644 index 00000000000..e4d0d92e235 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h @@ -0,0 +1,285 @@ +/* -*- C++ -*- */ + +//============================================================================= +/** + * @file Naming_Utils.h + * + * $Id$ + * + * Implement wrappers useful to Naming Service clients and servers. + * + * + * @author Nagarajan Surendran (naga@cs.wustl.edu) + * @author Matt Braun <mjb2@cs.wustl.edu> + * @author and Douglas C. Schmidt <schmidt@cs.wustl.edu>. + */ +//============================================================================= + + +#ifndef TAO_NAMING_UTILS_H +#define TAO_NAMING_UTILS_H +#include /**/ "ace/pre.h" + +#include "tao/ORB.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/IOR_Multicast.h" +#include "Naming_Context_Interface.h" +#include "nsconf.h" + +// Forward decl; +class TAO_Persistent_Context_Index; +class TAO_Storable_Naming_Context_Activator; + +/** + * @class TAO_Naming_Server + * + * @brief Defines a wrapper class that holds the root Naming Context. + * + * This class either finds an existing Naming Service (if the + * <resolve_for_existing_naming_service> flag is set) or creates + * one (if <resolve_for_existing_naming_service> flag isn't set or + * Naming Service was not found). This class also defines the + * operator-> so that <NamingContext> functions like <bind>, + * <unbind> .. can be called directly on a <TAO_Naming_Server> + * object, and be forwareded to the root Naming Context. + * This class is intended to simplify + * programs that want to play the role of a Naming Service + * server. To simplify programs that want to play the role of + * Naming Service clients, use <TAO_Naming_Client>. + * If a Naming Service is created locally, a TAO_IOR_Multicast + * event handler is created and installed on the ORB's reactor. + * This event handler allows other clients on the network to + * discover and use this Naming Service. + * Event handler listens on a multicast port for messages from + * clients looking for a Naming Service, and sends back the ior + * of the root Naming Context. For more information on how this + * bootstraping through a multicast process works, check out + * orbsvcs/orbsvcs/TAO_IOR_Multicast.*, implementation of + * <resolve_initial_references>, and orbsvcs/Naming/README. + */ +class TAO_Naming_Export TAO_Naming_Server +{ +public: + /// Default constructor. + TAO_Naming_Server (void); + + /** + * Constructor. Attempts to find an existing Naming Service if + * <resolve_for_existing_naming_service> is set to true. If it is + * false, or no Naming Service was found during a <timeout> period, + * create the Naming Service in this process. If creating the + * Naming Service locally, make the root context of size + * <context_size>, register it under the <poa>, and make the Naming + * Service persistent if <persistence_location> is not 0. + * (<persistence_location> specifies name of the file to use for + * persistent storage, <base_addr> specifies the address used for + * memory mapping <persistent_location> file). + * If <enable_multicast> is not zero then the service will respond + * to multicast location queries. + */ + TAO_Naming_Server (CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + size_t context_size = ACE_DEFAULT_MAP_SIZE, + ACE_Time_Value *timeout = 0, + int resolve_for_existing_naming_service = 1, + const ACE_TCHAR *persistence_location = 0, + void *base_addr = TAO_NAMING_BASE_ADDR, + int enable_multicast = 1, + int use_storable_context = 0, + int round_trip_timeout = 0, + int use_round_trip_timeout = 0); + + /** + * Initializer. Attempts to find an existing Naming Service if + * <resolve_for_existing_naming_service> is set to true. If it is + * false, or no Naming Service was found during a <timeout> period, + * create the Naming Service in this process. If creating the + * Naming Service locally, make the root context of size + * <context_size>, register it under the <poa>, and make the Naming + * Service persistent if <persistence_location> is not 0. + * (<persistence_location> specifies name of the file to use for + * persistent storage, <base_addr> specifies the address used for + * memory mapping <persistent_location> file). + * If <enable_multicast> is not zero then the service will respond + * to multicast location queries. + */ + int init (CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + size_t context_size = ACE_DEFAULT_MAP_SIZE, + ACE_Time_Value *timeout = 0, + int resolve_for_existing_naming_service = 1, + const ACE_TCHAR *persistence_location = 0, + void *base_addr = TAO_NAMING_BASE_ADDR, + int enable_multicast = 1, + int use_storable_context = 0, + int round_trip_timeout = 0, + int use_round_trip_timeout = 0); + + /// Initialize the Naming Service with the command line arguments and + /// the ORB. + int init_with_orb (int argc, + ACE_TCHAR *argv [], + CORBA::ORB_ptr orb); + + /// Destroy the child POA created in <init_with_orb> + int fini (void); + + /// Destructor. + ~TAO_Naming_Server (void); + + /// Returns the IOR of the naming service. + char * naming_service_ior (void); + + /// Returns a <NamingContext_ptr> for the root Naming Context. + CosNaming::NamingContext_ptr operator-> (void) const; + +protected: + /** + * Helper method: create Naming Service locally. + * Make the root context of size + * <context_size>, register it under the <root_poa>, and make the Naming + * Service persistent if <persistence_location> is not 0. + * (<persistence_location> specifies name of the file to use for + * persistent storage). + * If <enable_multicast> is not zero then the service will respond + * to multicast location queries. + */ + int init_new_naming (CORBA::ORB_ptr orb, + PortableServer::POA_ptr root_poa, + const ACE_TCHAR *persistence_location, + void *base_addr, + size_t context_size, + int enable_multicast, + int use_storable_context, + int round_trip_timeout = 0, + int use_round_trip_timeout = 0); + + /// parses the arguments. + int parse_args (int argc, ACE_TCHAR *argv[]); + + /// Root NamingContext_ptr. + CosNaming::NamingContext_var naming_context_; + + /// The ior_multicast event handler. + TAO_IOR_Multicast *ior_multicast_; + + /// The IOR string of the root naming context. + CORBA::String_var naming_service_ior_; + + /** + * Pointer to the object used to create/initialize + * the Naming Service when local persistent Naming Service is + * desired. + */ + TAO_Persistent_Context_Index *context_index_; + + /// The ORB + CORBA::ORB_var orb_; + + /// The Root POA. + PortableServer::POA_var root_poa_; + + /// The Naming Service POA. + PortableServer::POA_var ns_poa_; + + /// File to output the Naming Service IOR. + FILE *ior_output_file_; + + /// File to output the process id. + const ACE_TCHAR *pid_file_name_; + + /** + * Size of the hash_table allocated upon the creation of the Naming + * Service context (if one is created). Note: all the contexts + * created under the given context will use the same size for their + * initial hash table allocations. + */ + size_t context_size_; + + /// Path to the file to be used to store/read in Naming Service + /// persistent state. + const ACE_TCHAR *persistence_file_name_; + + /// Address to be used for memory mapping Naming Service state file, + /// identified by the <persistence_file_name_>. + void *base_address_; + + /// After how long the server should stop listening to requests (in + /// seconds). + size_t time_; + + /// If not zero multicast is enabled. + int multicast_; + + /// If not zero use flat file persistence + int use_storable_context_; + + /** + * If not zero use servant activator that uses flat file persistence. + */ + int use_servant_activator_; + + /** + * Need to retain the servant activator between calls to + * init_with_orb() and init_new_naming(). + */ + TAO_Storable_Naming_Context_Activator *servant_activator_; + + /** + * If not zero support redundant naming servers. + */ + int use_redundancy_; + + // If not zero use round trip timeout policy set to value specified + int round_trip_timeout_; + int use_round_trip_timeout_; +}; + +/** + * @class TAO_Naming_Client + * + * @brief This class is intended to simplify programs that want to play + * the role of Naming Service clients. + * + * Wrapper class that locates the root Naming Context. It also + * defines the operator-> so that <NamingContext> functions like + * <resolve>, etc. can be directly called on a + * <TAO_Naming_Client> object, and will be forwarded to the root + * Naming Context. + */ +class TAO_Naming_Export TAO_Naming_Client +{ +public: + // = Initialization and termination methods. + + /// Default constructor. + TAO_Naming_Client (void); + + /** + * Look for a Naming Service for a period of <timeout> using + * <resolve_initial_references>. Return 0 if Naming Service is + * successfully located, and -1 on failure. + */ + int init (CORBA::ORB_ptr orb, + ACE_Time_Value *timeout = 0); + + /// Destructor. + ~TAO_Naming_Client (void); + + /// Returns a pointer to the root Naming Context. + CosNaming::NamingContext_ptr operator-> (void) const; + + /** + * Returns a pointer to the root Naming Context. This ptr is + * duplicated via <_duplicate> so that it can be stored into a + * <*_var>. + */ + CosNaming::NamingContext_ptr get_context (void) const; + +protected: + /// Reference to the root Naming Context. + CosNaming::NamingContext_var naming_context_; +}; + +#include /**/ "ace/post.h" +#endif /* TAO_NAMING_UTILS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h index b97f3469164..c343a0ba7d0 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "Persistent_Entries.h" -#include "naming_serv_export.h" +#include "naming_export.h" #include "nsconf.h" #include "tao/PortableServer/PortableServer.h" @@ -41,7 +41,7 @@ * facilitates Persistent Naming Context servant initialization * upon Naming Server start-up. */ -class TAO_Naming_Serv_Export TAO_Persistent_Context_Index +class TAO_Naming_Export TAO_Persistent_Context_Index { public: // = Some typedefs for convenience. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h index 59a65b3dd85..bc4d9f22dad 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h @@ -16,8 +16,8 @@ #include /**/ "ace/pre.h" #include "ace/Hash_Map_With_Allocator_T.h" -#include "orbsvcs/CosNamingC.h" -#include "naming_serv_export.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "naming_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +37,7 @@ * Memory for the ior isn't allocated/deallocated, this class just * copies a pointer. */ -class TAO_Naming_Serv_Export TAO_Persistent_IntId +class TAO_Naming_Export TAO_Persistent_IntId { public: // = Initialization and termination methods. @@ -80,7 +80,7 @@ public: * Memory for id and kind isn't allocated/deallocated, this * class just copies pointers. */ -class TAO_Naming_Serv_Export TAO_Persistent_ExtId +class TAO_Naming_Export TAO_Persistent_ExtId { public: // = Initialization and termination methods. @@ -142,7 +142,7 @@ public: * they can be stored together as a <value> for a <key> in a * hash table holding the state of a Persistent Context Index. */ -class TAO_Naming_Serv_Export TAO_Persistent_Index_IntId +class TAO_Naming_Export TAO_Persistent_Index_IntId { public: // = Initialization and termination methods. @@ -186,7 +186,7 @@ public: * provide <hash> function for it to work with * ACE_Hash_Map_Manager. */ -class TAO_Naming_Serv_Export TAO_Persistent_Index_ExtId +class TAO_Naming_Export TAO_Persistent_Index_ExtId { public: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h index d3baab97b89..2b98c6f524f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h @@ -16,7 +16,7 @@ #include "Hash_Naming_Context.h" #include "Persistent_Entries.h" -#include "naming_serv_export.h" +#include "naming_export.h" /** * @class TAO_Persistent_Bindings_Map @@ -29,7 +29,7 @@ * from persistent storage) to make bindings persistent and * supports TAO_Bindings_Map interface. Used by TAO_Persistent_Naming_Context. */ -class TAO_Naming_Serv_Export TAO_Persistent_Bindings_Map : public TAO_Bindings_Map +class TAO_Naming_Export TAO_Persistent_Bindings_Map : public TAO_Bindings_Map { public: @@ -157,7 +157,7 @@ class TAO_Persistent_Context_Index; * process boundaries. Derives from TAO_Hash_Naming_Context and * uses TAO_Persistent_Bindings_Map to store name to object bindings. */ -class TAO_Naming_Serv_Export TAO_Persistent_Naming_Context : public TAO_Hash_Naming_Context +class TAO_Naming_Export TAO_Persistent_Naming_Context : public TAO_Hash_Naming_Context { public: /// Underlying data structure - typedef for ease of use. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index b3098abee20..62a189abd12 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -1,8 +1,6 @@ #include "Storable_Naming_Context.h" #include "Bindings_Iterator_T.h" -#include <tao/debug.h> - // The following #pragma is needed to disable a warning that occurs // in MSVC 6 due to the overly long debugging symbols generated for // the ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_...> > template @@ -19,126 +17,19 @@ const char * TAO_Storable_Naming_Context::root_name_; ACE_UINT32 TAO_Storable_Naming_Context::gcounter_; -ACE_Auto_Ptr<TAO_Storable_Base> TAO_Storable_Naming_Context::gfl_; +TAO_Storable_Base * TAO_Storable_Naming_Context::gfl_; int TAO_Storable_Naming_Context::redundant_; ACE_RCSID (Naming, Storable_Naming_Context, "$Id$") -TAO_Storable_IntId::TAO_Storable_IntId (void) - : ref_ (""), - type_ (CosNaming::nobject) -{ -} - -TAO_Storable_IntId::TAO_Storable_IntId (const char * ior, - CosNaming::BindingType type) - : ref_ (ior), - type_ (type) -{ -} - -TAO_Storable_IntId::TAO_Storable_IntId (const TAO_Storable_IntId &rhs) -{ - ref_ = rhs.ref_; - type_ = rhs.type_; -} - -TAO_Storable_IntId::~TAO_Storable_IntId (void) -{ -} - -void -TAO_Storable_IntId::operator= (const TAO_Storable_IntId &rhs) -{ - // check for self assignment. - if (&rhs == this) - return; - - type_ = rhs.type_; - ref_ = rhs.ref_; -} - -TAO_Storable_ExtId::TAO_Storable_ExtId (void) - : id_ (""), - kind_ ("") -{ -} - -TAO_Storable_ExtId::TAO_Storable_ExtId (const char *id, - const char *kind) - : id_ (id) - , kind_ (kind) -{ -} - -TAO_Storable_ExtId::TAO_Storable_ExtId (const TAO_Storable_ExtId &rhs) -{ - id_ = rhs.id_; - kind_ = rhs.kind_; -} - -TAO_Storable_ExtId::~TAO_Storable_ExtId (void) -{ -} - -void -TAO_Storable_ExtId::operator= (const TAO_Storable_ExtId &rhs) -{ - // Check for self assignment. - if (&rhs == this) - return; - - id_ = rhs.id_; - kind_ = rhs.kind_; -} - -bool -TAO_Storable_ExtId::operator== (const TAO_Storable_ExtId &rhs) const -{ - return (ACE_OS::strcmp (id_.in(), rhs.id_.in()) == 0) - && (ACE_OS::strcmp (kind_.in(), rhs.kind_.in()) == 0); -} - -bool -TAO_Storable_ExtId::operator!= (const TAO_Storable_ExtId &rhs) const -{ - return (ACE_OS::strcmp (id_.in(), rhs.id_.in()) != 0) - || (ACE_OS::strcmp (kind_.in(), rhs.kind_.in()) != 0); -} - -u_long -TAO_Storable_ExtId::hash (void) const -{ - // @CJC I wager this could be optimized a bit better, but I'm not - // sure how much it's called. At the very least, we could allocate - // just one ACE_CString, and copy id_ and kind_ into that, rather than - // taking a double-hit on allocations. - ACE_CString temp (id_.in()); - temp += kind_.in(); - - return temp.hash (); -} - -const char * -TAO_Storable_ExtId::id (void) -{ - return id_.in(); -} - -const char * -TAO_Storable_ExtId::kind (void) -{ - return kind_.in(); -} - int TAO_Storable_Bindings_Map::unbind (const char *id, const char *kind) { ACE_TRACE("unbind"); - TAO_Storable_ExtId name (id, kind); + TAO_Persistent_ExtId name (id, kind); return this->map_.unbind (name); } @@ -169,8 +60,8 @@ TAO_Storable_Bindings_Map::find (const char *id, CosNaming::BindingType &type) { ACE_TRACE("find"); - TAO_Storable_ExtId name (id, kind); - TAO_Storable_IntId entry; + TAO_Persistent_ExtId name (id, kind); + TAO_Persistent_IntId entry; if (this->map_.find (name, entry) != 0) @@ -180,7 +71,7 @@ TAO_Storable_Bindings_Map::find (const char *id, else { ACE_DECLARE_NEW_CORBA_ENV; - obj = orb_->string_to_object (entry.ref_.in() ACE_ENV_ARG_PARAMETER); + obj = orb_->string_to_object (entry.ref_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); type = entry.type_; @@ -230,10 +121,9 @@ TAO_Storable_Bindings_Map::shared_bind (const char * id, int rebind) { ACE_TRACE("shared_bind"); - TAO_Storable_ExtId new_name (id, kind); - CORBA::String_var ior = orb_->object_to_string(obj); - TAO_Storable_IntId new_entry (ior.in(), type); - TAO_Storable_IntId old_entry; + TAO_Persistent_ExtId new_name (CORBA::string_dup(id), CORBA::string_dup(kind)); + TAO_Persistent_IntId new_entry (orb_->object_to_string(obj), type); + TAO_Persistent_IntId old_entry; if (rebind == 0) { @@ -268,12 +158,12 @@ void TAO_Storable_Naming_Context::Write(TAO_Storable_Base& wrtr) if( storable_context_->current_size() == 0 ) return; - ACE_Hash_Map_Iterator<TAO_Storable_ExtId,TAO_Storable_IntId, + ACE_Hash_Map_Iterator<TAO_Persistent_ExtId,TAO_Persistent_IntId, ACE_Null_Mutex> it = storable_context_->map().begin(); - ACE_Hash_Map_Iterator<TAO_Storable_ExtId,TAO_Storable_IntId, + ACE_Hash_Map_Iterator<TAO_Persistent_ExtId,TAO_Persistent_IntId, ACE_Null_Mutex> itend = storable_context_->map().end(); - ACE_Hash_Map_Entry<TAO_Storable_ExtId,TAO_Storable_IntId> ent = *it; + ACE_Hash_Map_Entry<TAO_Persistent_ExtId,TAO_Persistent_IntId> ent = *it; while (!(it == itend)) { @@ -302,11 +192,11 @@ void TAO_Storable_Naming_Context::Write(TAO_Storable_Base& wrtr) ACE_CString name; if (bt == CosNaming::nobject) { - name.set((*it).int_id_.ref_.in()); + name.set((*it).int_id_.ref_); } else { - CORBA::Object_var obj = orb_->string_to_object((*it).int_id_.ref_.in()); + CORBA::Object_var obj = orb_->string_to_object((*it).int_id_.ref_); PortableServer::ObjectId_var oid = poa_->reference_to_id(obj.in()); CORBA::String_var nm = PortableServer::ObjectId_to_string(oid.in()); const char *newname = nm.in(); @@ -330,7 +220,7 @@ TAO_Storable_Naming_Context::load_map(File_Open_Lock_and_Check *flck // create the new bindings map ACE_NEW_THROW_EX (bindings_map, - TAO_Storable_Bindings_Map (hash_table_size_,orb_.in()), + TAO_Storable_Bindings_Map (hash_table_size_,orb_), CORBA::NO_MEMORY ()); // get the data for this bindings map from the file @@ -411,7 +301,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check( file_name += context->name_; // Create the stream - fl_ = context->factory_->create_stream(file_name, ACE_TEXT_CHAR_TO_TCHAR(mode)); + fl_ = context->factory_->create_stream(file_name, mode); if (TAO_Storable_Naming_Context::redundant_) { if (fl_->open() != 0) @@ -466,11 +356,6 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check( ACE_CHECK; } } - else - { - // Need to insure that fl_ gets deleted - delete fl_; - } } void @@ -533,31 +418,14 @@ TAO_Storable_Naming_Context::TAO_Storable_Naming_Context ( TAO_Storable_Naming_Context::~TAO_Storable_Naming_Context (void) { ACE_TRACE("~TAO_Storable_Naming_Context"); + // build the file name + ACE_CString file_name(persistence_directory_); + file_name += "/"; + file_name += name_; + // and delete the file + TAO_Storable_Base * fl = factory_->create_stream(file_name, "w"); + fl->remove(); - // If we're in the DTOR as a result of the destroy() operation, - // then we go ahead and delete the file. Otherwise, we leave the - // file around because they need to be there for persistence. - if (this->destroyed_) - { - // Make sure we delete the associated stream - ACE_CString file_name (this->persistence_directory_); - file_name += "/"; - file_name += this->name_; - - // Now delete the file - ACE_Auto_Ptr<TAO_Storable_Base> - fl ( - this->factory_->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), - ACE_TEXT("r")) - ); - if (fl.get()) - { - if (TAO_debug_level > 5) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) NameService: removing file %s\n", - file_name.fast_rep())); - fl->remove (); - } - } } CosNaming::NamingContext_ptr @@ -671,7 +539,7 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) // acquire a lock on the file that holds our counter if (gfl_->open() != 0) { - delete gfl_.release(); + delete gfl_; ACE_THROW_RETURN(CORBA::PERSIST_STORE(), CosNaming::NamingContext::_nil ()); } @@ -679,7 +547,7 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_RETURN (CORBA::INTERNAL(), CosNaming::NamingContext::_nil ()); // get the counter from disk - *gfl_.get() >> global; + *gfl_ >> global; gcounter_ = global.counter(); // use it to generate a new name } @@ -690,7 +558,7 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) gcounter_++); // then save it back on disk global.counter(gcounter_); - *gfl_.get() << global; + *gfl_ << global; if(redundant_) { // and release our lock @@ -703,19 +571,19 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) // Create a new context. TAO_Storable_Naming_Context *new_context = 0; CosNaming::NamingContext_var result = - make_new_context (this->orb_.in (), + make_new_context (this->orb_, this->poa_.in (), poa_id, this->storable_context_->total_size (), this->factory_, - ACE_TEXT_CHAR_TO_TCHAR (this->persistence_directory_.c_str ()), + this->persistence_directory_.c_str (), &new_context ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); // Since this is a new context, make an empty map in it ACE_NEW_THROW_EX (new_context->storable_context_, - TAO_Storable_Bindings_Map (hash_table_size_,orb_.in ()), + TAO_Storable_Bindings_Map (hash_table_size_,orb_), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); new_context->context_ = new_context->storable_context_; @@ -1356,11 +1224,11 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many, // Silliness below is required because of broken old g++!!! E.g., // without it, we could have just said HASH_MAP::ITERATOR everywhere we use ITER_DEF. - typedef ACE_Hash_Map_Manager<TAO_Storable_ExtId, - TAO_Storable_IntId, + typedef ACE_Hash_Map_Manager<TAO_Persistent_ExtId, + TAO_Persistent_IntId, ACE_Null_Mutex>::ITERATOR ITER_DEF; - typedef ACE_Hash_Map_Manager<TAO_Storable_ExtId, - TAO_Storable_IntId, + typedef ACE_Hash_Map_Manager<TAO_Persistent_ExtId, + TAO_Persistent_IntId, ACE_Null_Mutex>::ENTRY ENTRY_DEF; // Typedef to the type of BindingIterator servant for ease of use. @@ -1478,10 +1346,10 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); // Now does this already exist on disk? - ACE_TString file_name(persistence_directory); - file_name += ACE_TEXT("/"); - file_name += ACE_TEXT_CHAR_TO_TCHAR(poa_id); - ACE_Auto_Ptr<TAO_Storable_Base> fl (factory->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("r"))); + ACE_CString file_name(persistence_directory); + file_name += "/"; + file_name += poa_id; + TAO_Storable_Base * fl = factory->create_stream(file_name, "r"); if (fl->exists()) { // Load the map from disk @@ -1502,20 +1370,20 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( } // build the global file name - file_name += ACE_TEXT("_global"); + file_name += "_global"; // Create the stream for the counter used to uniquely creat context names - gfl_.reset(factory->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("crw"))); + gfl_ = factory->create_stream(file_name, "crw"); if (gfl_->open() != 0) { - delete gfl_.release(); + delete gfl_; ACE_THROW_RETURN(CORBA::PERSIST_STORE(), CosNaming::NamingContext::_nil ()); } // get the counter from disk TAO_NS_Persistence_Global global; - *gfl_.get() >> global; + *gfl_ >> global; gcounter_ = global.counter(); if(redundant_) gfl_->close(); @@ -1528,29 +1396,7 @@ template class ACE_Unbounded_List_Iterator<ACE_CString>; template class ACE_Unbounded_List<ACE_CString>; template class ACE_NS_Node<ACE_CString>; template class ACE_Auto_Basic_Ptr<TAO_Storable_Naming_Context>; -template class ACE_Hash_Map_Manager<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId>; -template class ACE_Hash_Map_Iterator_Base_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>; -template class ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex > >; -template class TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId> >; -template class ACE_Auto_Basic_Ptr<TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId> > >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Manager<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex> > -#pragma instantiate TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId> > -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId> > > #pragma instantiate ACE_Unbounded_List_Iterator<ACE_CString> #pragma instantiate ACE_Unbounded_List<ACE_CString> #pragma instantiate ACE_NS_Node<ACE_CString> diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h index a8d6c62f634..d7353f68281 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h @@ -16,6 +16,7 @@ #include "Hash_Naming_Context.h" #include "ace/Hash_Map_Manager.h" +#include "Persistent_Entries.h" #include "Storable.h" @@ -23,87 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class TAO_Naming_Serv_Export TAO_Storable_IntId -{ -public: - // = Initialization and termination methods. - /// Constructor. - TAO_Storable_IntId (void); - - /// Constructor. - TAO_Storable_IntId (/* in */ const char * ior, - CosNaming::BindingType type /* = CosNaming::nobject */); - - /// Copy constructor. - TAO_Storable_IntId (const TAO_Storable_IntId & rhs); - - /// Destructor. - ~TAO_Storable_IntId (void); - - /// Assignment operator. - void operator= (const TAO_Storable_IntId & rhs); - - // = Data members. - - /// Stringified IOR to be stored in a Persistent Naming Context. - CORBA::String_var ref_; - - /// Binding type for <ref_>. - CosNaming::BindingType type_; -}; - -class TAO_Naming_Serv_Export TAO_Storable_ExtId -{ -public: - // = Initialization and termination methods. - - /// Constructor. - TAO_Storable_ExtId (void); - - /// Constructor. - TAO_Storable_ExtId (/* in */ const char *id, - /* in */ const char *kind); - - /// Copy constructor. - TAO_Storable_ExtId (const TAO_Storable_ExtId & rhs); - - /// Destructor. - ~TAO_Storable_ExtId (void); - - // = Assignment and comparison methods. - - /// Assignment operator (does copy memory). - void operator= (const TAO_Storable_ExtId & rhs); - - /// Equality comparison operator (must match both id_ and kind_). - bool operator== (const TAO_Storable_ExtId &rhs) const; - - /// Inequality comparison operator. - bool operator!= (const TAO_Storable_ExtId &rhs) const; - - /// <hash> function is required in order for this class to be usable by - /// ACE_Hash_Map_Manager. - u_long hash (void) const; - - // = Data members. - - /// <id> portion of the name to be associated with some object - /// reference in a Storable Naming Context. - CORBA::String_var id_; - - /// <kind> portion of the name to be associated with some object - /// reference in a Storable Naming Context. - CORBA::String_var kind_; - - // Accessors. - // follow the mapping rules! - - const char * id (void); - const char * kind (void); - -}; - - /** * @class TAO_Storable_Bindings_Map * @@ -113,13 +33,13 @@ public: * A thin wrapper on top of ACE_Hash_Map_Manager. Supports * TAO_Bindings_Map interface. Used by TAO_Transient_Naming_Context. */ -class TAO_Naming_Serv_Export TAO_Storable_Bindings_Map : public TAO_Bindings_Map +class TAO_Naming_Export TAO_Storable_Bindings_Map : public TAO_Bindings_Map { public: /// Underlying data structure - typedef for ease of use. - typedef ACE_Hash_Map_Manager<TAO_Storable_ExtId, - TAO_Storable_IntId, + typedef ACE_Hash_Map_Manager<TAO_Persistent_ExtId, + TAO_Persistent_IntId, ACE_Null_Mutex> HASH_MAP; // = Initialization and termination methods. @@ -196,7 +116,7 @@ private: /// Hash map used for storage. HASH_MAP map_; - CORBA::ORB_var orb_; + CORBA::ORB_ptr orb_; }; @@ -213,7 +133,7 @@ private: * TAO_Hash_Naming_Context and uses TAO_Storable_Bindings_Map to * store name to object bindings. */ -class TAO_Naming_Serv_Export TAO_Storable_Naming_Context : public TAO_Hash_Naming_Context +class TAO_Naming_Export TAO_Storable_Naming_Context : public TAO_Hash_Naming_Context { public: @@ -377,7 +297,7 @@ protected: */ TAO_Storable_Bindings_Map *storable_context_; - CORBA::ORB_var orb_; + CORBA::ORB_ptr orb_; ACE_CString name_; @@ -400,7 +320,7 @@ protected: static const char * root_name_; /// The pointer to the global file used to allocate new contexts - static ACE_Auto_Ptr<TAO_Storable_Base> gfl_; + static TAO_Storable_Base *gfl_; /** * @class File_Open_Lock_and_Check diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp index 5402c1faed9..48edea3d915 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp @@ -34,7 +34,6 @@ TAO_Storable_Naming_Context_Activator (CORBA::ORB_ptr orb, TAO_Storable_Naming_Context_Activator::~TAO_Storable_Naming_Context_Activator () { - delete factory_; } PortableServer::Servant @@ -57,10 +56,10 @@ TAO_Storable_Naming_Context_Activator::incarnate (const PortableServer::ObjectId // the persistence elment needs to be read in. // Does this already exist on disk? - ACE_TString file_name(persistence_directory_); - file_name += ACE_TEXT("/"); - file_name += ACE_TEXT_CHAR_TO_TCHAR(poa_id.in()); - TAO_Storable_Base * fl = factory_->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("rw")); + ACE_CString file_name(persistence_directory_); + file_name += "/"; + file_name += poa_id.in(); + TAO_Storable_Base * fl = factory_->create_stream(file_name, "rw"); if (!fl->exists()) { ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h index c761c23661e..c3fa3cbf2ac 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h @@ -17,12 +17,11 @@ #define TAO_STORABLE_NAMING_CONTEXT_ACTIVATOR_H #include /**/ "ace/pre.h" -#include <tao/PortableServer/PortableServer.h> -#include <tao/LocalObject.h> +#include "tao/PortableServer/PortableServer.h" #if (TAO_HAS_MINIMUM_POA == 0) -#include "naming_serv_export.h" +#include "naming_export.h" class TAO_Naming_Service_Persistence_Factory; @@ -32,8 +31,8 @@ class TAO_Naming_Service_Persistence_Factory; * "lazily" created on demand in other processes by reading the * context file off disk only when a request to the context is made. */ -class TAO_Naming_Serv_Export TAO_Storable_Naming_Context_Activator : - public virtual PortableServer::ServantActivator +class TAO_Naming_Export TAO_Storable_Naming_Context_Activator : + public PortableServer::ServantActivator { public: diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h index 94ba088fb30..a4bfdca61d0 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h @@ -31,7 +31,7 @@ * A thin wrapper on top of ACE_Hash_Map_Manager. Supports * TAO_Bindings_Map interface. Used by TAO_Transient_Naming_Context. */ -class TAO_Naming_Serv_Export TAO_Transient_Bindings_Map : public TAO_Bindings_Map +class TAO_Naming_Export TAO_Transient_Bindings_Map : public TAO_Bindings_Map { public: @@ -126,7 +126,7 @@ private: * TAO_Hash_Naming_Context and uses TAO_Transient_Bindings_Map to * store name to object bindings. */ -class TAO_Naming_Serv_Export TAO_Transient_Naming_Context : public TAO_Hash_Naming_Context +class TAO_Naming_Export TAO_Transient_Naming_Context : public TAO_Hash_Naming_Context { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index c01902fea7e..92d8788807f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -9,7 +9,7 @@ ACE_RCSID (Notify, TAO_Notify_Admin, "$Id$") -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "Container_T.h" #include "Proxy.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h index c2c384df821..f26fd54b02d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -35,7 +35,7 @@ template <class TYPE> class TAO_Notify_Container_T; * */ -class TAO_Notify_Serv_Export TAO_Notify_Admin : public virtual TAO_Notify_Object +class TAO_Notify_Export TAO_Notify_Admin : public virtual TAO_Notify_Object { friend class TAO_Notify_Builder; public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp index 1d373b8eac8..74b0ec9f268 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp @@ -10,7 +10,7 @@ ACE_RCSID (Notify, TAO_Notify_AdminProperties, "$Id$") -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" TAO_Notify_AdminProperties::TAO_Notify_AdminProperties (void) : max_global_queue_length_ (CosNotification::MaxQueueLength, 0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h index e7f51ebc5a0..dada530013a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +37,7 @@ * @brief The AdminProperties per EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_AdminProperties +class TAO_Notify_Export TAO_Notify_AdminProperties : public TAO_Notify_PropertySeq { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h index d97e7bc2b7e..69e19fce382 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h @@ -23,7 +23,7 @@ #include "../Event.h" #include "../EventType.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" class TAO_Notify_Consumer; @@ -33,7 +33,7 @@ class TAO_Notify_Consumer; * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_AnyEvent_No_Copy : public TAO_Notify_Event +class TAO_Notify_Export TAO_Notify_AnyEvent_No_Copy : public TAO_Notify_Event { friend class TAO_Notify_Builder; public: @@ -85,7 +85,7 @@ protected: * @brief AnyEvent implementation. * */ -class TAO_Notify_Serv_Export TAO_Notify_AnyEvent : public TAO_Notify_AnyEvent_No_Copy +class TAO_Notify_Export TAO_Notify_AnyEvent : public TAO_Notify_AnyEvent_No_Copy { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h index 7cb9b02f115..d1bfcce96ae 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "../ProxyConsumer_T.h" @@ -37,7 +37,7 @@ * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushConsumer +class TAO_Notify_Export TAO_Notify_CosEC_ProxyPushConsumer : public virtual TAO_Notify_ProxyConsumer_T <POA_CosEventChannelAdmin::ProxyPushConsumer> { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h index 69acbdcdacc..a03473c6ca1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "../ProxySupplier_T.h" @@ -32,7 +32,7 @@ #endif /* _MSC_VER */ #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_ProxySupplier_T<POA_CosEventChannelAdmin::ProxyPushSupplier>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ @@ -42,7 +42,7 @@ TAO_Notify_ProxySupplier_T<POA_CosEventChannelAdmin::ProxyPushSupplier>; * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushSupplier +class TAO_Notify_Export TAO_Notify_CosEC_ProxyPushSupplier : public virtual TAO_Notify_ProxySupplier_T <POA_CosEventChannelAdmin::ProxyPushSupplier> { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h index 6c732c772ad..06267731c7a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxyConsumer_T.h" #if defined(_MSC_VER) @@ -36,7 +36,7 @@ * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_ProxyPushConsumer +class TAO_Notify_Export TAO_Notify_ProxyPushConsumer : public virtual TAO_Notify_ProxyConsumer_T < POA_CosNotifyChannelAdmin::ProxyPushConsumer > diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h index c24668ef7e8..4402cb21ad4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h @@ -20,8 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/Event_ForwarderS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event_ForwarderS.h" #include "../ProxySupplier_T.h" @@ -33,7 +33,7 @@ #endif /* _MSC_VER */ #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::ProxyPushSupplier>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ @@ -43,7 +43,7 @@ TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::ProxyPushSupplier>; * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_ProxyPushSupplier +class TAO_Notify_Export TAO_Notify_ProxyPushSupplier : public virtual TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::ProxyPushSupplier> { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp index d26302a2cee..fd1ee695630 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Notify, "$Id$") #include "ace/Refcounted_Auto_Ptr.h" -#include "orbsvcs/CosEventCommC.h" +#include "orbsvcs/orbsvcs/CosEventCommC.h" #include "../Event.h" TAO_Notify_PushConsumer::TAO_Notify_PushConsumer (TAO_Notify_ProxySupplier* proxy) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h index f5ca3aa8af9..5186338831e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "../Consumer.h" /** @@ -28,7 +28,7 @@ * @brief Wrapper for the PushConsumer that connect to the EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_PushConsumer : public TAO_Notify_Consumer +class TAO_Notify_Export TAO_Notify_PushConsumer : public TAO_Notify_Consumer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h index 9f9ab07131e..9beba8f8d00 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" class TAO_Notify_ProxyConsumer; @@ -31,7 +31,7 @@ class TAO_Notify_ProxyConsumer; * @brief Wrapper for the PushSupplier that connect to the EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_PushSupplier : public TAO_Notify_Supplier +class TAO_Notify_Export TAO_Notify_PushSupplier : public TAO_Notify_Supplier { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index 55acfa6f5dc..01eb6d0b631 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -12,7 +12,7 @@ ACE_RCSID (Notify, #include "ace/Message_Queue.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" #include "Method_Request.h" #include "Notify_Extensions.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h index fb2bdc4627c..d9159c14863 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,7 +23,7 @@ #include "ace/Null_Condition.h" #include "ace/Message_Queue.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Property.h" #include "Property_T.h" @@ -40,7 +40,7 @@ typedef ACE_Message_Queue<ACE_NULL_SYNCH> TAO_Notify_Message_Queue; * @brief Base Strategy to enqueue and dequeue items from a Message Queue. * */ -class TAO_Notify_Serv_Export TAO_Notify_Buffering_Strategy +class TAO_Notify_Export TAO_Notify_Buffering_Strategy { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h index bcf5abd6bec..d5c959508d3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,8 +22,8 @@ #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "AdminProperties.h" @@ -40,7 +40,7 @@ class TAO_Notify_Object; * @brief Helper class to create and activate CORBA objects. * */ -class TAO_Notify_Serv_Export TAO_Notify_Builder +class TAO_Notify_Export TAO_Notify_Builder { public: TAO_Notify_Builder (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h index bac8a0cbded..f7ff532b790 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h @@ -14,14 +14,14 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" #include "Peer.h" #include "Event.h" @@ -35,7 +35,7 @@ class TAO_Notify_Proxy; * @brief Astract Base class for wrapping consumer objects that connect to the EventChannel * */ -class TAO_Notify_Serv_Export TAO_Notify_Consumer : public TAO_Notify_Peer +class TAO_Notify_Export TAO_Notify_Consumer : public TAO_Notify_Peer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 5552b0df58b..3f9a5f08608 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -11,7 +11,7 @@ ACE_RCSID (RT_Notify, "$Id$") #include "ace/Auto_Ptr.h" -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Subscription_Change_Worker.h" #include "Proxy.h" #include "EventChannel.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h index 99964a7cd11..394f43568b0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/NotifyExtS.h" +#include "orbsvcs/orbsvcs/NotifyExtS.h" #include "Admin.h" @@ -37,7 +37,7 @@ * @brief Implementation of CosNotifyChannelAdmin::ConsumerAdmin * */ -class TAO_Notify_Serv_Export TAO_Notify_ConsumerAdmin : public POA_NotifyExt::ConsumerAdmin +class TAO_Notify_Export TAO_Notify_ConsumerAdmin : public POA_NotifyExt::ConsumerAdmin , public virtual TAO_Notify_Admin { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h index 7a296f0d5b5..ce37ae65180 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp index f3dddbcffe4..e469099bfa1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp @@ -9,8 +9,8 @@ #include "Factory.h" #include "POA_Helper.h" -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "Container_T.inl" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h index 6713775b023..59a953d6a46 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" /** * @class TAO_Notify_Container_T @@ -30,7 +30,7 @@ * */ template <class TYPE> -class TAO_Notify_Serv_Export TAO_Notify_Container_T +class TAO_Notify_Export TAO_Notify_Container_T { typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION; public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h index 5dccf6d8084..323ce71551c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h @@ -13,7 +13,7 @@ #define TAO_Notify_COSNOTIFY_INITIALIZER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,7 +25,7 @@ * @brief Helper to load the Cos Notification service into the service conf. for static links. * */ -class TAO_Notify_Serv_Export TAO_Notify_CosNotify_Initializer +class TAO_Notify_Export TAO_Notify_CosNotify_Initializer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index 4fcfbe8081e..5e97efabfa8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -8,7 +8,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Dynamic_Service.h" #include "tao/ORB_Core.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "tao/debug.h" ACE_RCSID (Notify, @@ -260,7 +260,7 @@ ACE_STATIC_SVC_DEFINE (TAO_CosNotify_Service, 0) -ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_CosNotify_Service) +ACE_FACTORY_DEFINE (TAO_Notify, TAO_CosNotify_Service) /*********************************************************************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h index 680d8d2432f..0d42cc867eb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h @@ -13,7 +13,7 @@ #define TAO_Notify_COSNOTIFY_SERVICE_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,7 +32,7 @@ class TAO_Notify_EventChannelFactory; * @brief A service object for creating the Notify Service Factory. * */ -class TAO_Notify_Serv_Export TAO_CosNotify_Service : public TAO_Notify_Service +class TAO_Notify_Export TAO_CosNotify_Service : public TAO_Notify_Service { public: /// Constuctor @@ -75,7 +75,7 @@ protected: }; ACE_STATIC_SVC_DECLARE (TAO_CosNotify_Service) -ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_CosNotify_Service) +ACE_FACTORY_DECLARE (TAO_Notify, TAO_CosNotify_Service) ACE_STATIC_SVC_DECLARE (TAO_Notify_Default_EMO_Factory_OLD) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp index 7f50ca0368e..4dc6a1be779 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp @@ -10,8 +10,8 @@ ACE_RCSID (Notify, TAO_Notify_Default_Factory, "$Id$") -#include "orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/ESF/ESF_Copy_On_Write.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h" #include "EventChannelFactory.h" #include "EventChannel.h" @@ -192,7 +192,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushSupplier*& proxy CORBA::NO_MEMORY ()); } -ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_Default_Factory) +ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_Default_Factory) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h index e82cab43b1b..f80e6704156 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h @@ -13,7 +13,7 @@ #define TAO_Notify_DEFAULT_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,7 +27,7 @@ * @brief Default_Factory interface for creating Notify Objects. * */ -class TAO_Notify_Serv_Export TAO_Notify_Default_Factory : public TAO_Notify_Factory +class TAO_Notify_Export TAO_Notify_Default_Factory : public TAO_Notify_Factory { public: /// Constructor @@ -91,7 +91,7 @@ public: virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL); }; -ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_Default_Factory) +ACE_FACTORY_DECLARE (TAO_Notify, TAO_Notify_Default_Factory) #if defined (__ACE_INLINE__) #include "Default_Factory.inl" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index af16effffeb..8f7f4c667bf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -13,7 +13,7 @@ #define TAO_Notify_ETCL_FILTER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +22,7 @@ #include "ace/Containers_T.h" #include "ace/Hash_Map_Manager.h" #include "ace/Atomic_Op.h" -#include "orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" #include "Notify_Constraint_Interpreter.h" #include "ace/Null_Mutex.h" @@ -39,7 +39,7 @@ * @brief Implementation of CosNotifyFilter::Filter servant. * */ -class TAO_Notify_Serv_Export TAO_Notify_ETCL_Filter : public POA_CosNotifyFilter::Filter, public PortableServer::RefCountServantBase +class TAO_Notify_Export TAO_Notify_ETCL_Filter : public POA_CosNotifyFilter::Filter, public PortableServer::RefCountServantBase { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index 4c01423eb95..a1984684d40 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -78,4 +78,4 @@ TAO_Notify_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_ ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ()); } -ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_ETCL_FilterFactory) +ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_ETCL_FilterFactory) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h index 5c67cbb8f5a..290d305d385 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" #include "FilterFactory.h" @@ -37,7 +37,7 @@ * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_ETCL_FilterFactory +class TAO_Notify_Export TAO_Notify_ETCL_FilterFactory : public virtual PortableServer::RefCountServantBase, public virtual POA_CosNotifyFilter::FilterFactory, public virtual TAO_Notify_FilterFactory @@ -86,7 +86,7 @@ protected: #pragma warning(pop) #endif /* _MSC_VER */ -ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_ETCL_FilterFactory) +ACE_FACTORY_DECLARE (TAO_Notify, TAO_Notify_ETCL_FilterFactory) #if defined (__ACE_INLINE__) #include "ETCL_FilterFactory.inl" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp index b731ccf5f4d..60fbdcbec72 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Notify, "$Id$") #include "tao/debug.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" TAO_Notify_Event::TAO_Notify_Event (void) :priority_ (CosNotification::Priority, CosNotification::DefaultPriority), diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h index 66a8c40bff3..595e666c059 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,9 +23,9 @@ #include "ace/Copy_Disabled.h" #include "ace/Refcounted_Auto_Ptr.h" -#include "orbsvcs/Event_ForwarderS.h" -#include "orbsvcs/CosNotifyFilterC.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/Event_ForwarderS.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" #include "Property.h" #include "Property_T.h" @@ -39,7 +39,7 @@ class TAO_Notify_EventType; * @brief Base class abstraction for Events flowing through the EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_Event : private ACE_Copy_Disabled +class TAO_Notify_Export TAO_Notify_Event : private ACE_Copy_Disabled { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h index e334a2f03e5..b2fcdf3618c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "Object.h" @@ -42,7 +42,7 @@ template <class TYPE> class TAO_Notify_Container_T; * @brief Implementation of CosNotifyChannelAdmin::EventChannel * */ -class TAO_Notify_Serv_Export TAO_Notify_EventChannel +class TAO_Notify_Export TAO_Notify_EventChannel : public POA_CosNotifyChannelAdmin::EventChannel, public virtual TAO_Notify_Object { diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h index c93fffd92a2..21db8d744e0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h @@ -14,14 +14,14 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/NotifyExtS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/NotifyExtS.h" #include "Object.h" @@ -41,7 +41,7 @@ template <class TYPE> class TAO_Notify_Container_T; * @brief Implementation of CosNotifyChannelAdmin::EventChannelFactory * */ -class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory +class TAO_Notify_Export TAO_Notify_EventChannelFactory : public virtual POA_NotifyExt::EventChannelFactory, public virtual TAO_Notify_Object { diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h index 3fcd875060d..c4a43ef34b4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" /** * @class TAO_Notify_EventType @@ -31,7 +31,7 @@ * It is used by the Event Manager as a key to find subscription lists. * */ -class TAO_Notify_Serv_Export TAO_Notify_EventType +class TAO_Notify_Export TAO_Notify_EventType { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h index 9f492e605e7..9d785fb16e6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h @@ -13,7 +13,7 @@ #define TAO_Notify_EVENTTYPESEQ_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,7 +28,7 @@ * @brief Allows operations using the CosNotification::EventTypeSeq type. * */ -class TAO_Notify_Serv_Export TAO_Notify_EventTypeSeq : public ACE_Unbounded_Set <TAO_Notify_EventType> +class TAO_Notify_Export TAO_Notify_EventTypeSeq : public ACE_Unbounded_Set <TAO_Notify_EventType> { typedef ACE_Unbounded_Set <TAO_Notify_EventType> inherited; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h index bb9aaa8159d..05bd7babae0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "tao/orbconf.h" @@ -47,7 +47,7 @@ typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxyConsumer, * @brief A class that manages the Consumer and Supplier maps. * */ -class TAO_Notify_Serv_Export TAO_Notify_Event_Manager +class TAO_Notify_Export TAO_Notify_Event_Manager { public: /// Constuctor @@ -118,7 +118,7 @@ protected: * @brief Inform ProxyConsumer of updates. * */ -class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxyConsumer> +class TAO_Notify_Export TAO_Notify_ProxyConsumer_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxyConsumer> { public: TAO_Notify_ProxyConsumer_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed); @@ -139,7 +139,7 @@ protected: * @brief Inform ProxySupplier of updates. * */ -class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxySupplier> +class TAO_Notify_Export TAO_Notify_ProxySupplier_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxySupplier> { public: TAO_Notify_ProxySupplier_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp index 089a32adca0..a9b78c54179 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp @@ -13,7 +13,7 @@ ACE_RCSID (Notify, TAO_Notify_Event_Map_Entry_T, "$Id$") -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Properties.h" #include "Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h index 869803a26b7..772248e88eb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp index 77de698806d..bad6e640cac 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp @@ -4,7 +4,7 @@ #define TAO_Notify_EVENT_MAP_T_C #include "Event_Map_T.h" -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Event_Map_Entry_T.h" #include "Properties.h" #include "Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h index 27567a9c7a2..12f22d596db 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h @@ -13,7 +13,7 @@ #define TAO_Notify_EVENT_MAP_T_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Factory.h index d2b7122a09d..aabe006a916 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Factory.h @@ -65,7 +65,7 @@ typedef TAO_ESF_Proxy_Collection<TAO_Notify_Proxy> TAO_Notify_Proxy_Collection; * @brief Factory interface for creating Notify Objects. * */ -class /*TAO_Notify_Serv_Export*/ TAO_Notify_Factory : public ACE_Service_Object +class /*TAO_Notify_Export*/ TAO_Notify_Factory : public ACE_Service_Object { public: /// Create ProxySupplier Collection diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h index 4e40b0b5ac9..7f7eb146061 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" #include "ace/Hash_Map_Manager.h" #include "ID_Factory.h" #include "Event.h" -#include "notify_serv_export.h" +#include "notify_export.h" /** * @class TAO_Notify_FilterAdmin @@ -29,7 +29,7 @@ * @brief FilterAdmin interface methods implementation. * */ -class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin +class TAO_Notify_Export TAO_Notify_FilterAdmin { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h index 689aacf4857..d15325cb57f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ * @brief Service Object to obtain a CosNotifyFilter::FilterFactory reference. * */ -class /*TAO_Notify_Serv_Export*/ TAO_Notify_FilterFactory : public ACE_Service_Object +class /*TAO_Notify_Export*/ TAO_Notify_FilterFactory : public ACE_Service_Object { public: /// Factory method to create a FilterFactory reference diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h index 554a52395a7..9fcf4aa8c7f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h @@ -13,14 +13,14 @@ #define TAO_Notify_FIND_WORKER_T_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "Container_T.h" #include "Object.h" @@ -31,7 +31,7 @@ * */ template <class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> -class TAO_Notify_Serv_Export TAO_Notify_Find_Worker_T : public TAO_ESF_Worker<TYPE> +class TAO_Notify_Export TAO_Notify_Find_Worker_T : public TAO_ESF_Worker<TYPE> { typedef TAO_Notify_Container_T<TYPE> CONTAINER; typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h index f3f6e3127b0..0a0ba05df0b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ * @brief A simple factory for generating ID's for objects created by Notify. * */ -class TAO_Notify_Serv_Export TAO_Notify_ID_Factory +class TAO_Notify_Export TAO_Notify_ID_Factory { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h index 6134050823d..545a4d968ba 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,7 +34,7 @@ class TAO_Notify_Method_Request; * @brief Base class for Method Requests that do not copy the event. * */ -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_No_Copy +class TAO_Notify_Export TAO_Notify_Method_Request_No_Copy { public: /// Execute the Request @@ -52,7 +52,7 @@ public: * @brief Interface for NS method Requests * */ -class TAO_Notify_Serv_Export TAO_Notify_Method_Request : public ACE_Message_Block +class TAO_Notify_Export TAO_Notify_Method_Request : public ACE_Message_Block { public: enum {PRIORITY_BASE = 32768}; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h index 156dadf13e9..a4150de15f8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h @@ -13,7 +13,7 @@ #define TAO_Notify_DISPATCH_METHOD_REQUEST_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -36,7 +36,7 @@ typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var , const TAO_Notify_Event_var& , TAO_Notify_ProxySupplier*> TAO_Notify_Method_Request_Dispatch_Base; -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch : public TAO_Notify_Method_Request_Dispatch_Base +class TAO_Notify_Export TAO_Notify_Method_Request_Dispatch : public TAO_Notify_Method_Request_Dispatch_Base , public TAO_Notify_Method_Request { public: @@ -64,7 +64,7 @@ typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event* , const TAO_Notify_Event* , TAO_Notify_ProxySupplier*> TAO_Notify_Method_Request_Dispatch_No_Copy_Base; -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch_No_Copy : public TAO_Notify_Method_Request_Dispatch_No_Copy_Base +class TAO_Notify_Export TAO_Notify_Method_Request_Dispatch_No_Copy : public TAO_Notify_Method_Request_Dispatch_No_Copy_Base , public TAO_Notify_Method_Request_No_Copy { public: @@ -95,7 +95,7 @@ typedef TAO_Notify_Method_Request_Dispatch_T<const TAO_Notify_Event_var& , const TAO_Notify_Event_var& , TAO_Notify_ProxySupplier*> TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base; -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch_No_Copy_Ex : public TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base +class TAO_Notify_Export TAO_Notify_Method_Request_Dispatch_No_Copy_Ex : public TAO_Notify_Method_Request_Dispatch_No_Copy_Ex_Base , public TAO_Notify_Method_Request_No_Copy { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h index 961db8c576b..9deef7494eb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h index 2703fef2955..4405bcf25d7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h @@ -13,7 +13,7 @@ #define TAO_Notify_METHOD_REQUEST_EVENT_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,7 +27,7 @@ * @brief A method request for storing events. * */ -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Event : public TAO_Notify_Method_Request +class TAO_Notify_Export TAO_Notify_Method_Request_Event : public TAO_Notify_Method_Request { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h index 42bb57b38e7..e2c29af3b0d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h @@ -13,13 +13,13 @@ #define TAO_Notify_LOOKUP_METHOD_REQUEST_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "Method_Request.h" #include "ProxyConsumer.h" #include "Consumer_Map.h" @@ -38,7 +38,7 @@ typedef TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event_var * @brief Lookup command object looks up the event type of the given event in the consumer map and send the event to each proxysupplier. * */ -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup : public TAO_Notify_Method_Request_Lookup_Base +class TAO_Notify_Export TAO_Notify_Method_Request_Lookup : public TAO_Notify_Method_Request_Lookup_Base , public TAO_Notify_Method_Request { public: @@ -65,7 +65,7 @@ typedef TAO_Notify_Method_Request_Lookup_T<const TAO_Notify_Event* * @brief Lookup command object looks up the event type of the given event in the consumer map and send the event to each proxysupplier. * */ -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup_No_Copy : public TAO_Notify_Method_Request_Lookup_No_Copy_Base +class TAO_Notify_Export TAO_Notify_Method_Request_Lookup_No_Copy : public TAO_Notify_Method_Request_Lookup_No_Copy_Base , public TAO_Notify_Method_Request_No_Copy { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h index f9f830b5d3e..9f99375103e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h @@ -13,13 +13,13 @@ #define TAO_Notify_METHOD_REQUEST_LOOKUP_T_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "ProxySupplier.h" /** @@ -29,7 +29,7 @@ * */ template <class EVENT, class PROXY, class EVENT_PARAM, class PROXY_PARAM> -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup_T : public TAO_ESF_Worker<TAO_Notify_ProxySupplier> +class TAO_Notify_Export TAO_Notify_Method_Request_Lookup_T : public TAO_ESF_Worker<TAO_Notify_ProxySupplier> { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h index 2491f9c2862..3f25e988bdc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h @@ -13,7 +13,7 @@ #define TAO_Notify_METHOD_REQUEST_SHUTDOWN_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,7 +29,7 @@ class TAO_Notify_ThreadPool_Task; * @brief Shutdown message for the ThreadPool_Task * */ -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Shutdown : public TAO_Notify_Method_Request +class TAO_Notify_Export TAO_Notify_Method_Request_Shutdown : public TAO_Notify_Method_Request { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h index 25943a091de..ed4059e674e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h @@ -13,7 +13,7 @@ #define TAO_Notify_METHOD_REQUEST_UPDATES_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -36,7 +36,7 @@ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq * @brief Command Object to send updates to proxys. * */ -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates : public TAO_Notify_Method_Request_Updates_Base +class TAO_Notify_Export TAO_Notify_Method_Request_Updates : public TAO_Notify_Method_Request_Updates_Base ,public TAO_Notify_Method_Request { public: @@ -64,7 +64,7 @@ typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq& * @brief Command Object to send updates to proxys. * */ -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_No_Copy : public TAO_Notify_Method_Request_Updates_No_Copy_Base +class TAO_Notify_Export TAO_Notify_Method_Request_Updates_No_Copy : public TAO_Notify_Method_Request_Updates_No_Copy_Base ,public TAO_Notify_Method_Request_No_Copy { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h index bfe4e4de89f..79ae18d313d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,7 +34,7 @@ namespace CORBA * */ template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM> -class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_T +class TAO_Notify_Export TAO_Notify_Method_Request_Updates_T { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h index efc137b0972..6d38a1e3013 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -15,15 +15,15 @@ #define TAO_NOTIFY_CONSTRAINT_INTERPRETER_H #include /**/ "ace/pre.h" -#include "orbsvcs/ETCL/ETCL_Interpreter.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/CosNotifyFilterC.h" -#include "notify_serv_export.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterC.h" +#include "notify_export.h" class TAO_Notify_Constraint_Visitor; @@ -32,7 +32,7 @@ class TAO_Notify_Constraint_Visitor; * * @brief "ETCL" Interpreter for the Notify queries. */ -class TAO_Notify_Serv_Export TAO_Notify_Constraint_Interpreter : public TAO_ETCL_Interpreter +class TAO_Notify_Export TAO_Notify_Constraint_Interpreter : public TAO_ETCL_Interpreter { public: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index 55fe28b9c8b..2b47025061a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -1,8 +1,8 @@ /* $Id$ */ #include "Notify_Constraint_Visitors.h" -#include "orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/ETCL/ETCL_y.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_y.h" #include "tao/Any_Unknown_IDL_Type.h" #include "tao/DynamicAny/DynArray_i.h" #include "tao/DynamicAny/DynSequence_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h index 431da6aaa51..c97c326b4ed 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -22,18 +22,18 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" #include "tao/Typecode.h" -#include "notify_serv_export.h" +#include "notify_export.h" class TAO_ETCL_Constraint; class TAO_ETCL_Literal_Constraint; class TAO_Notify_Property_Constraint; -class TAO_Notify_Serv_Export TAO_Notify_Constraint_Visitor +class TAO_Notify_Export TAO_Notify_Constraint_Visitor : public TAO_ETCL_Constraint_Visitor { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h index c42ff3682a1..c178ea925d7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h @@ -15,7 +15,7 @@ #define NOTIFY_DEFAULT_CO_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,7 +28,7 @@ * * Maintained for backward compatibility. */ -class TAO_Notify_Serv_Export TAO_Notify_Default_CO_Factory +class TAO_Notify_Export TAO_Notify_Default_CO_Factory { public: /// Helper function to register the default factory into the service diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h index 42bbdb9af3c..a39f87c19b4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h @@ -14,7 +14,7 @@ #define NOTIFY_DEFAULT_COLLECTION_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,7 +27,7 @@ * * */ -class TAO_Notify_Serv_Export TAO_Notify_Default_Collection_Factory +class TAO_Notify_Export TAO_Notify_Default_Collection_Factory { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h index 7cb29c5264a..f4372df65a8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h @@ -14,7 +14,7 @@ #define NOTIFY_DEFAULT_EMO_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,7 +26,7 @@ * @brief Maintained for backward compatibility. * */ -class TAO_Notify_Serv_Export TAO_Notify_Default_EMO_Factory +class TAO_Notify_Export TAO_Notify_Default_EMO_Factory { public: /// Helper function to register the default factory into the service diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h index b80d61f9b53..d6d6bfa8583 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h @@ -14,7 +14,7 @@ #define TAO_NOTIFY_DEFAULT_POA_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,7 +25,7 @@ * * @brief Maintained for backward compatibility. */ -class TAO_Notify_Serv_Export TAO_Notify_Default_POA_Factory +class TAO_Notify_Export TAO_Notify_Default_POA_Factory { public: /// Helper function to register the default factory into the service diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h index 91278b601ca..21fdb8359bc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -13,8 +13,8 @@ #define NOTIFY_EVENTCHANNELFACTORY_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "notify_serv_export.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -26,7 +26,7 @@ * @brief Class maintained for Backward compatibility. * */ -class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory_i +class TAO_Notify_Export TAO_Notify_EventChannelFactory_i { public: /// Create a factory servant and activates it with the default POA. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h index cf1f1044fac..216dcb9cd8c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +22,7 @@ #include "tao/PortableServer/Servant_Base.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "QoSProperties.h" #include "AdminProperties.h" @@ -39,7 +39,7 @@ class TAO_Notify_Timer; * @brief Base Object for RT_Notify's CORBA Objects. * */ -class TAO_Notify_Serv_Export TAO_Notify_Object : public TAO_Notify_Refcountable +class TAO_Notify_Export TAO_Notify_Object : public TAO_Notify_Refcountable { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h index 831b0dc163d..c5ca6bcd714 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ * @brief POA Abstraction. * */ -class TAO_Notify_Serv_Export TAO_Notify_POA_Helper : private ACE_Copy_Disabled +class TAO_Notify_Export TAO_Notify_POA_Helper : private ACE_Copy_Disabled { public: /// Default Constructor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h index deaf6fc66ea..710dd3e1202 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h @@ -13,13 +13,13 @@ #define TAO_Notify_PEER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" #include "EventTypeSeq.h" class TAO_Notify_Proxy; @@ -33,7 +33,7 @@ class TAO_Notify_Peer; * This object delegates its reference count to its creator proxy object. * */ -class TAO_Notify_Serv_Export TAO_Notify_Peer +class TAO_Notify_Export TAO_Notify_Peer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp index f9f7f9d567f..ecdfac34c9b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Properties.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "tao/debug.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h index 4542a14bff6..5d938efd4dc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,7 +24,7 @@ #include "tao/ORB.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" class TAO_Notify_Factory; class TAO_Notify_Builder; @@ -35,7 +35,7 @@ class TAO_Notify_Builder; * @brief Global properties that strategize Notify's run-time behaviour. * */ -class TAO_Notify_Serv_Export TAO_Notify_Properties +class TAO_Notify_Export TAO_Notify_Properties { friend class TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>; @@ -136,7 +136,7 @@ protected: typedef TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX> TAO_Notify_PROPERTIES; -TAO_NOTIFY_SERV_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_Properties, TAO_SYNCH_MUTEX) +TAO_NOTIFY_SINGLETON_DECLARE (TAO_Singleton, TAO_Notify_Properties, TAO_SYNCH_MUTEX) #if defined (__ACE_INLINE__) #include "Properties.inl" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property.h b/TAO/orbsvcs/orbsvcs/Notify/Property.h index e190ce11d32..f551b53c1a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,7 +23,7 @@ #include "tao/orbconf.h" #include "tao/TimeBaseC.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" template <class LOCK, class TYPE> class ACE_Atomic_Op; template <class TYPE> class TAO_Notify_Property_T; diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h index ca241e7bbee..72554b0170d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" @@ -32,7 +32,7 @@ * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_PropertySeq +class TAO_Notify_Export TAO_Notify_PropertySeq { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h index a0eeef05462..71cf25ad690 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" class TAO_Notify_PropertySeq; @@ -32,7 +32,7 @@ class TAO_Notify_PropertySeq; */ /*******************************************************************************/ -class TAO_Notify_Serv_Export TAO_Notify_Property_Boolean +class TAO_Notify_Export TAO_Notify_Property_Boolean { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h index ff39b43a068..88362f193b4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +22,7 @@ #include "ace/SString.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" class TAO_Notify_PropertySeq; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h index 59a4c347909..6a3bd3f04ad 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -35,7 +35,7 @@ class TAO_Notify_Peer; * @brief Base class proxy for all proxys in NS. * */ -class TAO_Notify_Serv_Export TAO_Notify_Proxy : public virtual TAO_Notify_Object +class TAO_Notify_Export TAO_Notify_Proxy : public virtual TAO_Notify_Object { friend class TAO_Notify_Peer; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h index 349c9c7b150..523c572b0a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #include "ace/Auto_Ptr.h" @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" #include "Refcountable_Guard_T.h" #include "Event.h" @@ -38,7 +38,7 @@ class TAO_Notify_Supplier; * @brief Base class for all types of ProxyConsumer implementations. * */ -class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer : public virtual TAO_Notify_Proxy +class TAO_Notify_Export TAO_Notify_ProxyConsumer : public virtual TAO_Notify_Proxy { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h index 6524ce1c0ab..051b7cf9af1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ * */ template <class SERVANT_TYPE> -class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_T +class TAO_Notify_Export TAO_Notify_ProxyConsumer_T : public virtual TAO_Notify_Proxy_T <SERVANT_TYPE>, public virtual TAO_Notify_ProxyConsumer { diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h index 272c9c3f1ea..641aab7f7b1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h @@ -13,7 +13,7 @@ #define TAO_Notify_PROXYSUPPLIER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +22,7 @@ #include "Event.h" #include "Proxy.h" #include "Refcountable_Guard_T.h" -#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" class TAO_Notify_Consumer; class TAO_Notify_ConsumerAdmin; @@ -33,7 +33,7 @@ class TAO_Notify_ConsumerAdmin; * @brief Base class for all the ProxySuppliers. * */ -class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier : public virtual TAO_Notify_Proxy +class TAO_Notify_Export TAO_Notify_ProxySupplier : public virtual TAO_Notify_Proxy { friend class TAO_Notify_Consumer; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h index ba545f61ff5..06068e72619 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h @@ -13,7 +13,7 @@ #define TAO_Notify_PROXYSUPPLIER_T_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h index 7a2726c251c..2ff51b1b7ba 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -125,21 +125,21 @@ public: }; #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_Event_Forwarder::StructuredProxyPushSupplier>; -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>; -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_Event_Forwarder::ProxyPushSupplier>; -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushSupplier>; -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>; -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer>; -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_CosNotifyChannelAdmin::ProxyPushConsumer>; -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushConsumer>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h index ba418a24cca..a4bbde9d275 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +31,7 @@ * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_QoSProperties : public TAO_Notify_PropertySeq +class TAO_Notify_Export TAO_Notify_QoSProperties : public TAO_Notify_PropertySeq { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp index ecbcb9a205d..3850565c129 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp @@ -7,7 +7,7 @@ #include "ETCL_FilterFactory.h" #include "RT_POA_Helper.h" #include "Properties.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "Object.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp index 4a507f456f7..6c049c0713e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp @@ -3,7 +3,7 @@ #include "RT_POA_Helper.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/debug.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "RT_Properties.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h index 24b3491f52c..85bcdecd998 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "POA_Helper.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" /** * @class TAO_Notify_RT_POA_Helper diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h index f0b9451f074..efa23ea9ecd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +31,7 @@ class TAO_Notify_Timer_Reactor; * @brief A reactive worker task. Simply executes the command in the caller's context. * */ -class TAO_Notify_Serv_Export TAO_Notify_Reactive_Task : public TAO_Notify_Worker_Task +class TAO_Notify_Export TAO_Notify_Reactive_Task : public TAO_Notify_Worker_Task { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h index bd8a7d5423c..696d491e724 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +31,7 @@ * @brief Thread-safe refounting, calls the <release> method when refcount falls to 0. * */ -class TAO_Notify_Serv_Export TAO_Notify_Refcountable +class TAO_Notify_Export TAO_Notify_Refcountable { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h index ac1af0f4323..4c7143bbb11 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h index 8c0f1949151..356bbde952f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h @@ -13,14 +13,14 @@ #define TAO_Notify_SEQ_WORKER_T_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "Container_T.h" /** @@ -30,7 +30,7 @@ * */ template <class TYPE> -class TAO_Notify_Serv_Export TAO_Notify_Seq_Worker_T : public TAO_ESF_Worker<TYPE> +class TAO_Notify_Export TAO_Notify_Seq_Worker_T : public TAO_ESF_Worker<TYPE> { typedef TAO_Notify_Container_T<TYPE> CONTAINER; typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h index b49b367c654..e0b582a537b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.h @@ -28,7 +28,7 @@ * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_Batch_Buffering_Strategy : public TAO_Notify_Buffering_Strategy +class TAO_Notify_Export TAO_Notify_Batch_Buffering_Strategy : public TAO_Notify_Buffering_Strategy { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h index b6d77b5d187..21e6c057798 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxyConsumer_T.h" @@ -37,7 +37,7 @@ * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushConsumer +class TAO_Notify_Export TAO_Notify_SequenceProxyPushConsumer : public virtual TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::SequenceProxyPushConsumer> { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h index 0e34de6a20b..640e8a0f1b4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxySupplier_T.h" @@ -32,7 +32,7 @@ #endif /* _MSC_VER */ #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_ProxySupplier_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ @@ -43,7 +43,7 @@ TAO_Notify_ProxySupplier_T<POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier> * * */ -class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushSupplier +class TAO_Notify_Export TAO_Notify_SequenceProxyPushSupplier : public virtual TAO_Notify_ProxySupplier_T <POA_CosNotifyChannelAdmin::SequenceProxyPushSupplier> { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h index 6cbe894caa3..297d35f5b80 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h @@ -38,7 +38,7 @@ class TAO_Notify_Timer; * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_SequencePushConsumer : public ACE_Event_Handler, public TAO_Notify_Consumer +class TAO_Notify_Export TAO_Notify_SequencePushConsumer : public ACE_Event_Handler, public TAO_Notify_Consumer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h index a74f32fe500..ef22534d68a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" class TAO_Notify_ProxyConsumer; @@ -30,7 +30,7 @@ class TAO_Notify_ProxyConsumer; * @brief Wrapper for the SequencePushSupplier that connect to the EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_SequencePushSupplier : public TAO_Notify_Supplier +class TAO_Notify_Export TAO_Notify_SequencePushSupplier : public TAO_Notify_Supplier { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h index 06881c5b999..06536f80d13 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h @@ -13,7 +13,7 @@ #define TAO_Notify_SERVICE_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +22,7 @@ #include "ace/Service_Object.h" #include "ace/Service_Config.h" #include "ace/Service_Object.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "tao/PortableServer/PortableServer.h" /** @@ -33,7 +33,7 @@ * Note that a Service creates only 1 Factory object. * */ -class TAO_Notify_Serv_Export TAO_Notify_Service : public ACE_Service_Object +class TAO_Notify_Export TAO_Notify_Service : public ACE_Service_Object { public: /// Define Service_Object method otherwise SunCC compiler complains. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h index d6edc36aa28..c964fdc8937 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h @@ -20,7 +20,7 @@ #include "../Event.h" #include "../EventType.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" /** * @class TAO_Notify_StructuredEvent_No_Copy @@ -29,7 +29,7 @@ * */ -class TAO_Notify_Serv_Export TAO_Notify_StructuredEvent_No_Copy : public TAO_Notify_Event +class TAO_Notify_Export TAO_Notify_StructuredEvent_No_Copy : public TAO_Notify_Event { public: /// Constuctor @@ -80,7 +80,7 @@ protected: * @brief StructuredEvent implementation. * */ -class TAO_Notify_Serv_Export TAO_Notify_StructuredEvent : public TAO_Notify_StructuredEvent_No_Copy +class TAO_Notify_Export TAO_Notify_StructuredEvent : public TAO_Notify_StructuredEvent_No_Copy { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h index 4d12ce3a297..143f1d5bd03 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxyConsumer_T.h" @@ -37,7 +37,7 @@ * @brief CosNotifyChannelAdmin::StructuredProxyPushConsumer implementation. * */ -class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushConsumer +class TAO_Notify_Export TAO_Notify_StructuredProxyPushConsumer : public virtual TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer> { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h index b308766a4ce..d71db430726 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h @@ -20,8 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/Event_ForwarderS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event_ForwarderS.h" #include "../ProxySupplier_T.h" @@ -33,7 +33,7 @@ #endif /* _MSC_VER */ #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Notify_Serv_Export +template class TAO_Notify_Export TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::StructuredProxyPushSupplier>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ @@ -44,7 +44,7 @@ TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::StructuredProxyPushSupplier>; * * */ -class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushSupplier +class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier : public virtual TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::StructuredProxyPushSupplier> { friend class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h index 1dca5c25440..36f6f7f8096 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "../Consumer.h" class TAO_Notify_ProxySupplier; @@ -30,7 +30,7 @@ class TAO_Notify_ProxySupplier; * @brief Wrapper for the StructuredPushConsumer that connect to the EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_StructuredPushConsumer : public TAO_Notify_Consumer +class TAO_Notify_Export TAO_Notify_StructuredPushConsumer : public TAO_Notify_Consumer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h index f2329db3542..65e95c3d175 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" class TAO_Notify_ProxyConsumer; @@ -30,7 +30,7 @@ class TAO_Notify_ProxyConsumer; * @brief Wrapper for the StructuredPushSupplier that connect to the EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_StructuredPushSupplier : public TAO_Notify_Supplier +class TAO_Notify_Export TAO_Notify_StructuredPushSupplier : public TAO_Notify_Supplier { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h index 4c8813d5055..5763746a3c0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h @@ -13,14 +13,14 @@ #define TAO_SUBSCRIPTION_CHANGE_WORKER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" class TAO_Notify_Proxy; @@ -30,7 +30,7 @@ class TAO_Notify_Proxy; * @brief * */ -class TAO_Notify_Serv_Export TAO_Notify_Subscription_Change_Worker : public TAO_ESF_Worker<TAO_Notify_Proxy> +class TAO_Notify_Export TAO_Notify_Subscription_Change_Worker : public TAO_ESF_Worker<TAO_Notify_Proxy> { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h index 5a2d12d05f0..8494f431b98 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h @@ -13,7 +13,7 @@ #define TAO_Notify_SUPPLIER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -21,7 +21,7 @@ #include "Peer.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" class TAO_Notify_ProxyConsumer; /** @@ -30,7 +30,7 @@ class TAO_Notify_ProxyConsumer; * @brief Base Wrappers for Suppliers that connect to the EventChannel. * */ -class TAO_Notify_Serv_Export TAO_Notify_Supplier : public TAO_Notify_Peer +class TAO_Notify_Export TAO_Notify_Supplier : public TAO_Notify_Peer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp index 37823207801..5df0e4487eb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -10,7 +10,7 @@ ACE_RCSID (RT_Notify, TAO_Notify_SupplierAdmin, "$Id$") -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Builder.h" #include "Proxy.h" #include "EventChannel.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h index bb1233eeae0..c9ae1a3ff5d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h @@ -14,13 +14,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/NotifyExtS.h" +#include "orbsvcs/orbsvcs/NotifyExtS.h" #include "Admin.h" @@ -37,7 +37,7 @@ * @brief Implementation of CosNotifyChannelAdmin::SupplierAdmin * */ -class TAO_Notify_Serv_Export TAO_Notify_SupplierAdmin +class TAO_Notify_Export TAO_Notify_SupplierAdmin : public virtual POA_NotifyExt::SupplierAdmin, public virtual TAO_Notify_Admin { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h index 609f419193a..d34b04ec8f3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h @@ -13,7 +13,7 @@ #define TAO_Notify_SUPPLIER_MAP_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h index c2f41442f98..11572744df0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -36,7 +36,7 @@ class TAO_Notify_Timer_Queue; * @brief Implements a Thread Pool Worker Task. * */ -class TAO_Notify_Serv_Export TAO_Notify_ThreadPool_Task : public TAO_Notify_Worker_Task, public ACE_Task<ACE_NULL_SYNCH> +class TAO_Notify_Export TAO_Notify_ThreadPool_Task : public TAO_Notify_Worker_Task, public ACE_Task<ACE_NULL_SYNCH> { friend class TAO_Notify_Method_Request_Shutdown; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer.h b/TAO/orbsvcs/orbsvcs/Notify/Timer.h index 502bc9724ec..bee6d611f8a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer.h @@ -13,7 +13,7 @@ #define TAO_Notify_TIMER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ class ACE_Event_Handler; * @brief Interface for scheduling timers. * */ -class TAO_Notify_Serv_Export TAO_Notify_Timer : public TAO_Notify_Refcountable +class TAO_Notify_Export TAO_Notify_Timer : public TAO_Notify_Refcountable { public: /// Destructor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h index 17410fdfd4a..d080e94ea38 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h @@ -13,7 +13,7 @@ #define TAO_Notify_TIMER_QUEUE_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +31,7 @@ * @brief ACE_Timer_Queue based timer. * */ -class TAO_Notify_Serv_Export TAO_Notify_Timer_Queue : public TAO_Notify_Timer +class TAO_Notify_Export TAO_Notify_Timer_Queue : public TAO_Notify_Timer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h index 0ec20ac850e..01fa5803054 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h @@ -13,7 +13,7 @@ #define TAO_Notify_TIMER_REACTOR_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,7 +29,7 @@ class ACE_Reactor; * @brief Reactor::instance based timer. The timers are dispatched by the main thread. * */ -class TAO_Notify_Serv_Export TAO_Notify_Timer_Reactor : public TAO_Notify_Timer +class TAO_Notify_Export TAO_Notify_Timer_Reactor : public TAO_Notify_Timer { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h index 394e3651059..bd6722bc464 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +37,7 @@ class TAO_Notify_Buffering_Strategy; * the <shutdown> method should be called to release memory. * */ -class TAO_Notify_Serv_Export TAO_Notify_Worker_Task : public TAO_Notify_Refcountable +class TAO_Notify_Export TAO_Notify_Worker_Task : public TAO_Notify_Refcountable { public: /// Constuctor diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc index 4a02b0f3e09..e81eab1b0c3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc @@ -1,9 +1,9 @@ // -*- MPC -*- // $Id$ -project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba { +project(PortableGroup) : orbsvcslib, core, naming, iormanip, minimum_corba { sharedname = TAO_PortableGroup - idlflags += -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h + idlflags += -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL tagchecks += PortableGroup after += FTORB_Utils @@ -27,7 +27,4 @@ project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_ PortableGroup } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h index da03189be1b..eaa82e6fa23 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index 3f9ae599e2b..ec531c6db41 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -31,7 +31,7 @@ namespace TAO ///////////////////////////////// // Includes needed by this header #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupS.h" +#include "orbsvcs/orbsvcs/PortableGroupS.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h index ff2033929ff..383c2d212eb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h @@ -24,7 +24,7 @@ #include "PG_Factory_Set.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h index 3bca619031f..f02e4ef24d7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "ace/Array_Base.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h index 8123d3d3828..2f9cd627c70 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h @@ -25,7 +25,7 @@ #include "PG_Factory_Map.h" #include "portablegroup_export.h" #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index 46a592332ce..a4ed36858b7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -13,9 +13,9 @@ #include "PG_Group_Factory.h" #include "PG_Property_Utils.h" #include "PG_conf.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "PG_Object_Group.h" -#include <orbsvcs/PortableGroup/PG_Utils.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Utils.h> ACE_RCSID (PortableGroup, PG_Group_Factory, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h index e5b47d0434c..5ee17c6fe25 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h @@ -24,7 +24,7 @@ #include "ace/Hash_Map_Manager.h" #include "portablegroup_export.h" #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "PG_Object_Group_Manipulator.h" ////////////////// diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h index 224daf9c011..afeb6b0f0e3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h @@ -24,7 +24,7 @@ #include "PG_Operators.h" #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h index 105ef25e6db..e79eee61713 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "ace/ACE.h" /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h index 6786897aa0f..803c91fef12 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h @@ -25,7 +25,7 @@ #include "PG_Location_Hash.h" #include "PG_Location_Equal_To.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "ace/Array_Base.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h index 919c58f7ca5..b0946aee165 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "ace/Unbounded_Set.h" /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h index 573430ccf66..ca507057adb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index 962a9a1232a..8a3610bf7b4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupS.h" +#include "orbsvcs/orbsvcs/PortableGroupS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h index b754df541a2..0f43e24cfb6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h @@ -24,7 +24,7 @@ #include "PG_MemberInfo.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "tao/PortableServer/Key_Adapters.h" #include "tao/PortableServer/PortableServerC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index cd3af12150b..80cebd62071 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -558,7 +558,7 @@ TAO::PG_Object_Group::locations_of_members (ACE_ENV_SINGLE_ARG_DECL) size_t pos = 0; for (MemberMap_Iterator it = this->members_.begin(); it != this->members_.end(); - ++it) + this->members_.begin()) { const PortableGroup::Location & location = (*it).ext_id_; PortableGroup::Location & out = (*result)[pos]; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index 1dd180acf08..fd15c9ed07a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -33,7 +33,7 @@ #include "PG_Location_Hash.h" #include "PG_Location_Equal_To.h" #include "PG_Object_Group_Manipulator.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "tao/PortableServer/PortableServer.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/ACE.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h index 0dcd056438c..3efa0733b9b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h @@ -15,7 +15,7 @@ #define TAO_PG_OBJECT_GROUP_MANIPULATOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroupS.h" +#include "orbsvcs/orbsvcs/PortableGroupS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h index 881c5330403..955edabcb44 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h @@ -23,7 +23,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" /// Global CosNaming::Name equality operator. /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h index d171ec5590a..a44f8f08cf3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h @@ -19,8 +19,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupS.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/PortableGroupS.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "portablegroup_export.h" #include "ace/Vector_T.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h index 3d49398a974..bcb172e10ed 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h @@ -24,7 +24,7 @@ #include "PG_Default_Property_Validator.h" #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupS.h" +#include "orbsvcs/orbsvcs/PortableGroupS.h" #include "ace/Functor.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h index ebfdf10f3d1..df3ef19c8bd 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h @@ -21,8 +21,8 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupS.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/PortableGroupS.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h index ca02b71a413..f92ee4608d3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" namespace TAO_PG diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h index f919cbbbba6..e06cb37338a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h @@ -14,7 +14,7 @@ #define TAO_PORTABLEGROUP_UTILS_H #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h index dcb0e3d5a5e..cb517a5b7fb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h @@ -22,7 +22,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #ifndef TAO_PG_MAX_OBJECT_GROUPS // @@ why create arbitrary limits? /// The maximum number of object groups to be managed by the diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h index f1bb0a0dadf..a5468f224ab 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h @@ -23,7 +23,7 @@ #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" // Forward references class PortableGroup_Request_Dispatcher; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp index 234c493816d..f632dcd0e42 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp @@ -4,11 +4,10 @@ #include "PortableGroup_Loader.h" #include "PortableGroup_ORBInitializer.h" -#include "ace/Dynamic_Service.h" #include "tao/ORB_Core.h" -ACE_RCSID (PortableGroup, - PortableGroup_Loader, +ACE_RCSID (PortableGroup, + PortableGroup_Loader, "$Id$") TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void) @@ -20,6 +19,7 @@ TAO_PortableGroup_Loader::init (int /*argc*/, char* /*argv*/ []) { ACE_TRACE ("TAO_PortableGroup_Loader::init"); + // Register the ORB initializer. ACE_TRY_NEW_ENV { @@ -56,17 +56,10 @@ TAO_PortableGroup_Loader::init (int /*argc*/, int TAO_PortableGroup_Loader::Initializer (void) { - ACE_Service_Config::process_directive (ace_svc_desc_TAO_PortableGroup_Loader); - TAO_PortableGroup_Loader *tmp = - ACE_Dynamic_Service<TAO_PortableGroup_Loader>::instance ( - "PortableGroup_Loader"); + ACE_Service_Config::static_svcs ()-> + insert (&ace_svc_desc_TAO_PortableGroup_Loader); - if (tmp != 0) - { - return tmp->init (0, 0); - } - - return -1; + return 0; } ACE_STATIC_SVC_DEFINE (TAO_PortableGroup_Loader, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h index e98a74c367d..53defa5a3b8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h @@ -23,7 +23,7 @@ #include "ace/Hash_Map_Manager_T.h" #include "portablegroup_export.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "tao/Object_KeyC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp index 870c1dd57e4..4f050964da1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp @@ -145,14 +145,10 @@ TAO_UIPMC_Connection_Handler::open (void*) this->local_addr_.get_port_number ())); } + // Set the id in the transport now that we're active. + this->transport ()->id ((size_t) this->udp_socket_.get_handle ()); this->using_mcast_ = 0; - // Set that the transport is now connected, if fails we return -1 - // Use C-style cast b/c otherwise we get warnings on lots of - // compilers - if (!this->transport ()->post_open ((size_t) this->udp_socket_.get_handle ())) - return -1; - return 0; } @@ -191,7 +187,16 @@ TAO_UIPMC_Connection_Handler::close_connection (void) int TAO_UIPMC_Connection_Handler::handle_input (ACE_HANDLE h) { - return this->handle_input_eh (h, this); + int result = + this->handle_input_eh (h, this); + + if (result == -1) + { + this->close_connection (); + return 0; + } + + return result; } int diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index efd15ccd74f..52e225f76a3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -15,7 +15,8 @@ #include "UIPMC_Profile.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (tao, +ACE_RCSID (tao, + UIPMC_Connector, "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -24,9 +25,9 @@ template class ACE_NonBlocking_Connect_Handler<TAO_UIPMC_Connection_Handler>; template class ACE_Map_Entry<ACE_INET_Addr, TAO_UIPMC_Connection_Handler *>; -template class ACE_Hash_Map_Iterator_Base_Ex <ACE_INET_Addr, +template class ACE_Hash_Map_Iterator_Base_Ex <ACE_INET_Addr, TAO_UIPMC_Connection_Handler *, - ACE_Hash<ACE_INET_Addr>, + ACE_Hash<ACE_INET_Addr>, ACE_Equal_To <ACE_INET_Addr>, ACE_Null_Mutex>; template class ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, @@ -173,7 +174,7 @@ TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *, if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) UIPMC_Connector::make_connection, ") + ACE_TEXT ("(%P|%t) UIPMC_Connector::connect - ") ACE_TEXT ("new connection on HANDLE %d\n"), svc_handler->get_handle ())); } @@ -260,26 +261,17 @@ TAO_UIPMC_Connector::init_uipmc_properties (void) return 0; } -int -TAO_UIPMC_Connector::cancel_svc_handler ( - TAO_Connection_Handler * svc_handler) -{ - ACE_UNUSED_ARG(svc_handler); - - // Noop - return 0; -} #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Hash <ACE_INET_Addr>; template class ACE_Equal_To <ACE_INET_Addr>; -template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, - TAO_UIPMC_Connection_Handler *, - ACE_Hash <ACE_INET_Addr>, - ACE_Equal_To <ACE_INET_Addr>, +template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, + TAO_UIPMC_Connection_Handler *, + ACE_Hash <ACE_INET_Addr>, + ACE_Equal_To <ACE_INET_Addr>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<ACE_INET_Addr, +template class ACE_Hash_Map_Entry<ACE_INET_Addr, TAO_UIPMC_Connection_Handler *>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -288,7 +280,7 @@ template class ACE_Hash_Map_Entry<ACE_INET_Addr, #pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, \ TAO_UIPMC_Connection_Handler *, \ ACE_Hash <ACE_INET_Addr>, \ - ACE_Equal_To <ACE_INET_Addr>, + ACE_Equal_To <ACE_INET_Addr>, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Entry<ACE_INET_Addr, \ TAO_UIPMC_Connection_Handler *> diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h index 1a61217fe5f..b51a33166ad 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h @@ -74,8 +74,6 @@ protected: /// initialize <uipmc_properties_>. int init_uipmc_properties (void); - /// Cancel the passed cvs handler from the connector - virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler); protected: @@ -89,14 +87,14 @@ private: TAO_UIPMC_Connection_Handler *, ACE_Hash < ACE_INET_Addr >, ACE_Equal_To < ACE_INET_Addr >, - ACE_Null_Mutex > + ACE_Null_Mutex > svc_handler_table_; typedef ACE_Hash_Map_Iterator_Ex < ACE_INET_Addr, TAO_UIPMC_Connection_Handler *, ACE_Hash < ACE_INET_Addr >, ACE_Equal_To < ACE_INET_Addr >, - ACE_Null_Mutex > + ACE_Null_Mutex > SvcHandlerIterator; }; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index ecd5b159eff..e86dd663778 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -12,8 +12,8 @@ #include "tao/target_specification.h" #include "ace/os_include/os_ctype.h" -#include "orbsvcs/miopC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/miopC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" ACE_RCSID (PortableGroup, UIPMC_Profile, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h index d36affa5d6a..718e2189352 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h @@ -26,7 +26,7 @@ #include "tao/Object_KeyC.h" #include "tao/target_specification.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "UIPMC_Endpoint.h" #include "portablegroup_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index c8345528754..660ff9e4a0a 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -13,7 +13,7 @@ // // ============================================================================ -#include "orbsvcs/Property/CosPropertyService_i.h" +#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index 0c9b289bb2b..b1b8db89c92 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Property/property_export.h" +#include "orbsvcs/orbsvcs/Property/property_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosPropertyServiceS.h" +#include "orbsvcs/orbsvcs/CosPropertyServiceS.h" #include "ace/Hash_Map_Manager.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Property/Makefile.am b/TAO/orbsvcs/orbsvcs/Property/Makefile.am new file mode 100644 index 00000000000..b8235d16383 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Property/Makefile.am @@ -0,0 +1,34 @@ +##--------------------------------------------------------------------------- +## $Id$ +## +## Makefile for TAO's Property Service library +## +##--------------------------------------------------------------------------- + +## +## Process this file with automake to create Makefile.in +## + +## The number in AUTOMAKE_OPTIONS is the minimum required version automake +## needed to process this file. +AUTOMAKE_OPTIONS = 1.4 + +INCLUDES = -I$(top_builddir) -I$(top_srcdir) + +lib_LTLIBRARIES = libTAO_Property.la + +libTAO_Property_la_LDADD = \ + $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la + +libTAO_Property_la_SOURCES = \ + CosPropertyService_i.cpp + +noinst_HEADERS = \ + CosPropertyService_i.h + +## Clean up some additional files/directories possibly created during +## the configure script tests. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations + diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc index f7f6b360f08..25a5b715b5e 100644 --- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc @@ -3,7 +3,7 @@ project(RTCORBAEvent) : orbsvcslib, core, rtevent, naming, rtportableserver { sharedname = TAO_RTCORBAEvent - idlflags += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=orbsvcs/naming_export.h + idlflags += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=naming_export.h dynamicflags = TAO_RTCORBAEVENT_BUILD_DLL tagchecks += RTCORBAEvent @@ -16,7 +16,4 @@ project(RTCORBAEvent) : orbsvcslib, core, rtevent, naming, rtportableserver { Event/EC_RTCORBA_Factory.cpp } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc index 7f085c71104..6dc0951b364 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc @@ -1,9 +1,10 @@ // -*- MPC -*- // $Id$ -project(RTCosScheduling) : orbsvcslib, core, rtportableserver, interceptors { +project(RTCosScheduling) : orbsvcslib, rtportableserver { + requires += interceptors sharedname = TAO_RTCosScheduling - idlflags += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=orbsvcs/RTCosScheduling/RTCosScheduling_export.h + idlflags += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling/RTCosScheduling_export.h dynamicflags += TAO_RTCOSSCHEDULING_BUILD_DLL tagchecks += RTCosScheduling diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h index dd082d74960..927ea184ddb 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h @@ -40,8 +40,8 @@ #endif /* _MSC_VER */ #include "ace/SString.h" -#include <orbsvcs/RTCosSchedulingC.h> -#include <orbsvcs/RTCosScheduling/RTCosScheduling_export.h> +#include <orbsvcs/orbsvcs/RTCosSchedulingC.h> +#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_export.h> #include "tao/RTCORBA/Priority_Mapping_Manager.h" #include "tao/PortableInterceptorC.h" #include "tao/RTCORBA/Linear_Priority_Mapping.h" diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h index e14252adbee..68736e46743 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h @@ -28,8 +28,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SString.h" -#include <orbsvcs/RTCosSchedulingS.h> -#include <orbsvcs/RTCosScheduling/RTCosScheduling_export.h> +#include <orbsvcs/orbsvcs/RTCosSchedulingS.h> +#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_export.h> #include "RTCosScheduling_PCP_Manager.h" #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc index d6db88b80d5..4c16b6563c9 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc @@ -3,7 +3,7 @@ project(RTEvent) : orbsvcslib, core, svc_utils, messaging { sharedname = TAO_RTEvent - idlflags += -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=orbsvcs/Event/event_export.h + idlflags += -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h dynamicflags = TAO_RTEVENT_BUILD_DLL tagchecks += RTEvent // Add this include path for precompiled headers @@ -98,7 +98,4 @@ project(RTEvent) : orbsvcslib, core, svc_utils, messaging { Event/EC_UDP_Admin.cpp } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc index 3f21416f2b1..4db6a0244fd 100644 --- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc @@ -1,9 +1,9 @@ // -*- MPC -*- // $Id$ -project(RTEventLogAdmin) : orbsvcslib, core, naming, rtoldevent, dslogadmin_serv { +project(RTEventLogAdmin) : orbsvcslib, core, naming, rtoldevent, dslogadmin { sharedname = TAO_RTEventLogAdmin - idlflags += -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=orbsvcs/Log/rteventlog_export.h + idlflags += -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=Log/rteventlog_export.h dynamicflags = TAO_RTEVENTLOG_BUILD_DLL tagchecks += RTEventLog @@ -21,7 +21,4 @@ project(RTEventLogAdmin) : orbsvcslib, core, naming, rtoldevent, dslogadmin_serv Log/RTEventLogNotification.cpp } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc index 65cc129d41c..05c798afe81 100644 --- a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc @@ -18,7 +18,4 @@ project(RTKokyuEvent) : orbsvcslib, core, rtevent, rtsched, kokyu { Event/EC_Kokyu_Scheduling.cpp } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc index 8404a01fe2d..5dc01d0f008 100644 --- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc @@ -25,9 +25,6 @@ project(RTOLDEvent) : orbsvcslib, core, rtevent, rtsched { } } - Template_Files { - } - // Since the resource file for RTOLDEvent does // not match the project name, we must explicitly list it. Resource_Files { diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc index ef34a2ec2a6..10d1a12c805 100644 --- a/TAO/orbsvcs/orbsvcs/RTSched.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc @@ -1,9 +1,9 @@ // -*- MPC -*- // $Id$ -project(RTSched) : orbsvcslib, core, naming, portableserver, svc_utils { +project(RTSched) : orbsvcslib, core, naming { sharedname = TAO_RTSched - idlflags += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h + idlflags += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h dynamicflags = TAO_RTSCHED_BUILD_DLL tagchecks += Sched @@ -22,9 +22,6 @@ project(RTSched) : orbsvcslib, core, naming, portableserver, svc_utils { } } - Template_Files { - } - // To avoid picking up RTSchedEvent.rc as well, explicitly list the files. Resource_Files { RTSched.rc diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc index d9573d62649..9772d7c9422 100644 --- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc @@ -19,7 +19,4 @@ project(RTSchedEvent) : orbsvcslib, core, rtevent, rtsched { Event/EC_Sched_Filter_Builder.cpp } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc index fe038ea6723..fb309aff484 100644 --- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc +++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc @@ -1,9 +1,9 @@ // -*- MPC -*- // $Id$ -project(RT_Notification) : orbsvcslib, core, rtcorba, notification_serv { +project(RT_Notification) : orbsvcslib, core, svc_utils, dynamicany, rtcorba, notification { sharedname = TAO_RT_Notification - idlflags += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=orbsvcs/Notify/rt_notify_export.h + idlflags += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=Notify/rt_notify_export.h dynamicflags = TAO_RT_NOTIFY_BUILD_DLL tagchecks += RT_Notify @@ -20,7 +20,4 @@ project(RT_Notification) : orbsvcslib, core, rtcorba, notification_serv { Notify/Structured/RT_StructuredProxyPushSupplier.cpp } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index 1d8f66b8315..5f6507cdb91 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Runtime_Scheduler.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Runtime_Scheduler.h" #include "ace/OS_NS_string.h" #if defined (__ACE_INLINE__) -#include "orbsvcs/Runtime_Scheduler.i" +#include "orbsvcs/orbsvcs/Runtime_Scheduler.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (orbsvcs, diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h index 18243c7d367..6c2430af091 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h @@ -18,9 +18,9 @@ #define ACE_RUNTIME_SCHEDULER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/Sched/sched_export.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/orbsvcs/Sched/sched_export.h" class TAO_RTSched_Export ACE_Runtime_Scheduler : public POA_RtecScheduler::Scheduler { @@ -280,7 +280,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/Runtime_Scheduler.i" +#include "orbsvcs/orbsvcs/Runtime_Scheduler.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc index 77799e6f58d..35e300730f6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc @@ -1,10 +1,10 @@ // -*- MPC -*- -// // $Id$ -project(SSLIOP) : orbsvcslib, core, security, ssl, interceptors { +project(SSLIOP) : orbsvcslib, core, security, ssl { + requires += interceptors sharedname = TAO_SSLIOP - idlflags += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h + idlflags += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=SSLIOP/SSLIOP_Export.h dynamicflags = TAO_SSLIOP_BUILD_DLL tagchecks += SSLIOP pch_header = @@ -17,10 +17,8 @@ project(SSLIOP) : orbsvcslib, core, security, ssl, interceptors { Source_Files(ORBSVCS_COMPONENTS) { SSLIOP { SSLIOPC.cpp + SSLIOPS.cpp SSLIOP } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h index d4da8a87a43..5ea0b77669f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h @@ -24,7 +24,7 @@ #include "SSLIOP_Current.h" -#include "orbsvcs/SSLIOPC.h" +#include "orbsvcs/orbsvcs/SSLIOPC.h" #include "tao/IIOP_Connection_Handler.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index b2c65d931e1..a13d41276d7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -10,7 +10,6 @@ #include "tao/Thread_Lane_Resources.h" #include "tao/Connect_Strategy.h" #include "tao/Wait_Strategy.h" -#include "tao/Profile_Transport_Resolver.h" #include "ace/Strategies_T.h" @@ -126,7 +125,7 @@ TAO::IIOP_SSL_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) IIOP_SSL connection failed.\n") + ACE_TEXT ("TAO (%P|%t) IIOP connection failed.\n") ACE_TEXT ("TAO (%P|%t) This is most likely ") ACE_TEXT ("due to a hostname lookup ") ACE_TEXT ("failure.\n"))); @@ -140,7 +139,7 @@ TAO::IIOP_SSL_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) TAO_Transport * TAO::IIOP_SSL_Connector::make_connection ( - TAO::Profile_Transport_Resolver *r, + TAO::Profile_Transport_Resolver *, TAO_Transport_Descriptor_Interface &desc, ACE_Time_Value *max_wait_time) { @@ -164,16 +163,6 @@ TAO::IIOP_SSL_Connector::make_connection ( this->active_connect_strategy_->synch_options (max_wait_time, synch_options); - // If we don't need to block for a transport just set the timeout to - // be zero. - ACE_Time_Value tmp_zero (ACE_Time_Value::zero); - if (!r->blocked ()) - { - synch_options.timeout (ACE_Time_Value::zero); - max_wait_time = &tmp_zero; - } - - IIOP_SSL_Connection_Handler *svc_handler = 0; // Connect. @@ -200,45 +189,97 @@ TAO::IIOP_SSL_Connector::make_connection ( // another thread pick up the completion and potentially deletes the // handler before we get a chance to increment the reference count. - // Make sure that we always do a remove_reference - ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler); + // No immediate result. Wait for completion. + if (result == -1 && errno == EWOULDBLOCK) + { + if (TAO_debug_level) + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_SSL_Connector::make_connection(), " + "going to wait for connection completion on local" + "handle [%d]\n", + svc_handler->get_handle ())); + + // Wait for connection completion. No need to specify timeout + // to wait() since the correct timeout was passed to the + // Connector. The Connector will close the handler in the case + // of timeouts, so the event will complete (either success or + // failure) within timeout. + result = + this->active_connect_strategy_->wait (svc_handler, + 0); + + if (TAO_debug_level > 2) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_SSL_Connector::make_connection(), " + "wait done for handle[%d], result = %d\n", + svc_handler->get_handle (), result)); + } - TAO_Transport *transport = - svc_handler->transport (); + // There are three possibilities when wait() returns: (a) + // connection succeeded; (b) connection failed; (c) wait() + // failed because of some other error. It is easy to deal with + // (a) and (b). (c) is tricky since the connection is still + // pending and may get completed by some other thread. The + // following code deals with (c). - if (result == -1) - { - // No immediate result, wait for completion - if (errno == EWOULDBLOCK) + // Check if the handler has been closed. + int closed = + svc_handler->is_closed (); + + // In case of failures and close() has not be called. + if (result == -1 && + !closed) { - // Try to wait until connection completion. Incase we block, then we - // get a connected transport or not. In case of non block we get - // a connected or not connected transport - if (!this->wait_for_connection_completion (r, - transport, - max_wait_time)) + // First, cancel from connector. + this->base_connector_.cancel (svc_handler); + + // Double check to make sure the handler has not been closed + // yet. This double check is required to ensure that the + // connection handler was not closed yet by some other + // thread since it was still registered with the connector. + // Once connector.cancel() has been processed, we are + // assured that the connector will no longer open/close this + // handler. + closed = + svc_handler->is_closed (); + + // If closed, there is nothing to do here. If not closed, + // it was either opened or is still pending. + if (!closed) { - if (TAO_debug_level > 2) - ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - IIOP_SSL_Connector::" - "make_connection, " - "wait for completion failed\n")); + // Check if the handler has been opened. + int open = + svc_handler->is_open (); + + // Some other thread was able to open the handler even + // though wait failed for this thread. + if (open) + // Overwrite <result>. + result = 0; + else + { + // Assert that it is still connecting. + ACE_ASSERT (svc_handler->is_connecting ()); + + // Force close the handler now. + svc_handler->close (); + } } } - else - { - // Transport is not usable - transport = 0; - } } - // In case of errors transport is zero - if (transport == 0) + // Irrespective of success or failure, remove the extra #REFCOUNT#. + svc_handler->remove_reference (); + + // In case of errors. + if (result == -1) { // Give users a clue to the problem. if (TAO_debug_level) { ACE_DEBUG ((LM_ERROR, - "TAO (%P|%t) - IIOP_SSL_Connector::make_connection, " + "TAO (%P|%t) - IIOP_Connector::make_connection, " "connection to <%s:%d> failed (%p)\n", iiop_endpoint->host (), iiop_endpoint->port (), "errno")); @@ -251,11 +292,14 @@ TAO::IIOP_SSL_Connector::make_connection ( // #REFCOUNT# is one. if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - IIOP_SSL_Connector::make_connection, " + "TAO (%P|%t) - IIOP_Connector::make_connection, " "new connection to <%s:%d> on Transport[%d]\n", iiop_endpoint->host (), iiop_endpoint->port (), svc_handler->peer ().get_handle ())); + TAO_Transport *transport = + svc_handler->transport (); + // Add the handler to Cache int retval = this->orb_core ()->lane_resources ().transport_cache ().cache_transport ( @@ -271,54 +315,36 @@ TAO::IIOP_SSL_Connector::make_connection ( if (TAO_debug_level > 0) { ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - IIOP_SSL_Connector::make_connection, " + "TAO (%P|%t) - IIOP_Connector::make_connection, " "could not add the new connection to cache\n")); } return 0; } - if (transport->is_connected () && - transport->wait_strategy ()->register_handler () != 0) - { - // Registration failures. + // If the wait strategy wants us to be registered with the reactor + // then we do so. If registeration is required and it succeeds, + // #REFCOUNT# becomes two. + retval = transport->wait_strategy ()->register_handler (); - // Purge from the connection cache, if we are not in the cache, this - // just does nothing. - (void) transport->purge_entry (); + // Registration failures. + if (retval != 0) + { + // Purge from the connection cache. + transport->purge_entry (); // Close the handler. - (void) transport->close_connection (); + svc_handler->close (); if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - IIOP_SSL_Connector [%d]::make_connection, " - "could not register the transport " - "in the reactor.\n", - transport->id ())); + { + ACE_ERROR ((LM_ERROR, + "TAO (%P|%t) - IIOP_Connector::make_connection, " + "could not register the new connection in the reactor\n")); + } return 0; } return transport; } - -int -TAO::IIOP_SSL_Connector::cancel_svc_handler ( - TAO_Connection_Handler * svc_handler) -{ - IIOP_SSL_Connection_Handler* handler= - dynamic_cast<IIOP_SSL_Connection_Handler*>(svc_handler); - - if (handler) - { - // Cancel from the connector - this->base_connector_.cancel (handler); - - return 0; - } - else - { - return -1; - } -} diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h index ab1b6449ec6..24f4481fc61 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -81,8 +81,6 @@ namespace TAO TAO_Transport *make_connection (TAO::Profile_Transport_Resolver *r, TAO_Transport_Descriptor_Interface &desc, ACE_Time_Value *timeout = 0); - - virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler); //@} private: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h index 35c7786ddc8..b0868330068 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h @@ -30,8 +30,8 @@ #include "SSLIOP_Connection_Handler.h" #include "SSLIOP_Accept_Strategy.h" -#include "orbsvcs/SSLIOPC.h" /* CSIv1 */ -#include "orbsvcs/CSIIOPC.h" /* CSIv2 */ +#include "orbsvcs/orbsvcs/SSLIOPC.h" /* CSIv1 */ +#include "orbsvcs/orbsvcs/CSIIOPC.h" /* CSIv2 */ namespace TAO { diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp index d22485f2af1..286959c539d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp @@ -1,7 +1,6 @@ // $Id$ #include "SSLIOP_ClientCredentials.h" -#include "SSLIOP_OwnCredentials.h" ACE_RCSID (SSLIOP, @@ -9,12 +8,8 @@ ACE_RCSID (SSLIOP, "$Id$") -TAO::SSLIOP::ClientCredentials::ClientCredentials ( - X509 * cert, - EVP_PKEY *evp, - SSL * ssl) - : SSLIOP_Credentials (cert, evp), - ssl_ (TAO::SSLIOP::OpenSSL_traits< ::SSL >::_duplicate (ssl)) +TAO::SSLIOP::ClientCredentials::ClientCredentials (X509 *cert, EVP_PKEY *evp) + : TAO::SSLIOP::Credentials (cert, evp) { } @@ -86,53 +81,34 @@ SecurityLevel3::OwnCredentials_ptr TAO::SSLIOP::ClientCredentials::parent_credentials (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - SecurityLevel3::OwnCredentials_ptr creds = - SecurityLevel3::OwnCredentials::_nil (); - - ACE_NEW_THROW_EX (creds, - TAO::SSLIOP::OwnCredentials ( - ::SSL_get_certificate (this->ssl_.in ()), - ::SSL_get_privatekey (this->ssl_.in ())), - CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (creds); - - return creds; + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), + SecurityLevel3::OwnCredentials::_nil ()); } CORBA::Boolean -TAO::SSLIOP::ClientCredentials::client_authentication ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::SSLIOP::ClientCredentials::client_authentication (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - // If the client presented no certificate (i.e. cert_.ptr() == 0), - // the client was not authenticated. Otherwise, verify the peer's - // certificate. - - return - this->x509_.in () != 0 - && SSL_get_verify_result (this->ssl_.in ()) == X509_V_OK; + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } CORBA::Boolean TAO::SSLIOP::ClientCredentials::target_authentication (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false); + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } CORBA::Boolean TAO::SSLIOP::ClientCredentials::confidentiality (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false); + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } CORBA::Boolean -TAO::SSLIOP::ClientCredentials::integrity (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::SSLIOP::ClientCredentials::integrity (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - // TAO's SSLIOP pluggable transport always provides integrity. Note - // that if we - - return true; + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h index 647a42edd0b..c4a1b7e7240 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h @@ -16,16 +16,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h" -#include "orbsvcs/SSLIOP/SSLIOP_SSL.h" +#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h" -#include "orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" @@ -36,7 +35,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ - namespace TAO { namespace SSLIOP @@ -50,14 +48,12 @@ namespace TAO */ class TAO_SSLIOP_Export ClientCredentials : public virtual SecurityLevel3::ClientCredentials, - public virtual SSLIOP_Credentials + public virtual Credentials { public: /// Constructor - ClientCredentials (::X509 * cert, - ::EVP_PKEY * evp, - ::SSL * ssl); + ClientCredentials (::X509 *cert, ::EVP_PKEY *evp); /** * @name SecurityLevel3::Credentials Methods @@ -131,12 +127,6 @@ namespace TAO */ ~ClientCredentials (void); - private: - - /// Reference to the OpenSSL @c SSL data structure associated - /// with the current security context (e.g. SSL connection). - TAO::SSLIOP::SSL_var ssl_; - }; } // End SSLIOP namespace diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp index 980a4d6cf68..6660602351c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp @@ -164,11 +164,10 @@ TAO::SSLIOP::Connection_Handler::open (void *) this->peer ().get_handle ())); } - // Set that the transport is now connected, if fails we return -1 + // Set the id in the transport now that we're active. // Use C-style cast b/c otherwise we get warnings on lots of - // compilers - if (!this->transport ()->post_open ((size_t) this->get_handle ())) - return -1; + // compilers. + this->transport ()->id ((size_t) this->get_handle ()); // @@ Not needed this->state_changed (TAO_LF_Event::LFS_SUCCESS); @@ -191,7 +190,16 @@ TAO::SSLIOP::Connection_Handler::close_connection (void) int TAO::SSLIOP::Connection_Handler::handle_input (ACE_HANDLE h) { - return this->handle_input_eh (h, this); + const int result = + this->handle_input_eh (h, this); + + if (result == -1) + { + this->close_connection (); + return 0; + } + + return result; } int @@ -230,7 +238,9 @@ TAO::SSLIOP::Connection_Handler::handle_close (ACE_HANDLE, int TAO::SSLIOP::Connection_Handler::close (u_long) { - return this->close_handler (); + this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED); + this->transport ()->remove_reference (); + return 0; } int diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index ba933c34608..cc2f125e75a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -4,7 +4,7 @@ #include "SSLIOP_Util.h" #include "SSLIOP_X509.h" -#include "orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/orbsvcs/SecurityLevel2C.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -126,7 +126,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Connector::connect, ") + ACE_TEXT ("TAO (%P|%t) Connector::connect - ") ACE_TEXT ("looking for SSLIOP connection.\n"))); TAO_Endpoint *endpoint = desc->endpoint (); @@ -370,7 +370,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( // If the invocation wants integrity without confidentiality but the // server does not support "no protection," then it won't be - // possible to provide integrity. In order to support integrity + // possible provide integrity. In order to support integrity // without confidentiality, encryption must be disabled but secure // hashes must remain enabled. This is achieved using the "eNULL" // cipher. However, the "eNULL" cipher is only enabled on the @@ -411,29 +411,15 @@ TAO::SSLIOP::Connector::ssliop_connect ( { if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, ") + ACE_TEXT ("(%P|%t) SSLIOP_Connector::connect ") ACE_TEXT ("got existing transport[%d]\n"), transport->id ())); - - // When the transport is not connected wait for completion - if (!transport->is_connected()) - { - if (!this->wait_for_connection_completion (resolver, - transport, - max_wait_time)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect,") - ACE_TEXT ("wait for completion failed\n"))); - - } - } } else { if (TAO_debug_level > 4) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, ") + ACE_TEXT ("(%P|%t) SSLIOP_Connector::connect ") ACE_TEXT ("making a new connection \n"))); // Purge connections (if necessary) @@ -461,7 +447,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( { if (TAO_debug_level > 0) ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) Unable to create SSLIOP ") + ACE_TEXT ("(%P|%t) Unable to create SSLIOP ") ACE_TEXT ("service handler.\n"))); return 0; @@ -515,7 +501,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( ACE_THROW_RETURN (CORBA::INV_POLICY (), 0); } - TAO::SSLIOP::OwnCredentials_var credentials = + TAO::SSLIOP::Credentials_var credentials = this->retrieve_credentials (resolver->stub (), svc_handler->peer ().ssl () ACE_ENV_ARG_PARAMETER); @@ -529,15 +515,6 @@ TAO::SSLIOP::Connector::ssliop_connect ( this->active_connect_strategy_->synch_options (max_wait_time, synch_options); - // If we don't need to block for a transport just set the timeout to - // be zero. - ACE_Time_Value tmp_zero (ACE_Time_Value::zero); - if (!resolver->blocked ()) - { - synch_options.timeout (ACE_Time_Value::zero); - max_wait_time = &tmp_zero; - } - // We obtain the transport in the <svc_handler> variable. As we // know now that the connection is not available in Cache we can // make a new connection @@ -553,39 +530,91 @@ TAO::SSLIOP::Connector::ssliop_connect ( // the #REFCOUNT# on the handler is one since close() gets // called on the handler. - // Make sure that we always do a remove_reference - ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler); + // No immediate result. Wait for completion. + if (result == -1 && errno == EWOULDBLOCK) + { + if (TAO_debug_level > 2) + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - SSLIOP_Connector::ssliop_connect(), " + "going to wait for connection completion on local" + "handle [%d]\n", + svc_handler->get_handle ())); + + // Wait for connection completion. No need to specify timeout + // to wait() since the correct timeout was passed to the + // Connector. The Connector will close the handler in the case + // of timeouts, so the event will complete (either success or + // failure) within timeout. + result = + this->active_connect_strategy_->wait (svc_handler, + 0); + + if (TAO_debug_level > 2) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - IIOP_Connector::make_connection" + "wait done for handle[%d], result = %d\n", + svc_handler->get_handle (), result)); + } - transport = - svc_handler->transport (); + // There are three possibilities when wait() returns: (a) + // connection succeeded; (b) connection failed; (c) wait() + // failed because of some other error. It is easy to deal with + // (a) and (b). (c) is tricky since the connection is still + // pending and may get completed by some other thread. The + // following code deals with (c). - if (result == -1) - { - // No immediate result, wait for completion - if (errno == EWOULDBLOCK) + // Check if the handler has been closed. + int closed = + svc_handler->is_closed (); + + // In case of failures and close() has not be called. + if (result == -1 && + !closed) { - // Try to wait until connection completion. Incase we block, then we - // get a connected transport or not. In case of non block we get - // a connected or not connected transport - if (!this->wait_for_connection_completion (resolver, - transport, - max_wait_time)) + // First, cancel from connector. + this->base_connector_.cancel (svc_handler); + + // Double check to make sure the handler has not been closed + // yet. This double check is required to ensure that the + // connection handler was not closed yet by some other + // thread since it was still registered with the connector. + // Once connector.cancel() has been processed, we are + // assured that the connector will no longer open/close this + // handler. + closed = + svc_handler->is_closed (); + + // If closed, there is nothing to do here. If not closed, + // it was either opened or is still pending. + if (!closed) { - if (TAO_debug_level > 2) - ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - SSLIOP_Connector::" - "ssliop_connect, " - "wait for completion failed\n")); + // Check if the handler has been opened. + int open = + svc_handler->is_open (); + + // Some other thread was able to open the handler even + // though wait failed for this thread. + if (open) + // Overwrite <result>. + result = 0; + else + { + // Assert that it is still connecting. + ACE_ASSERT (svc_handler->is_connecting ()); + + // Force close the handler now. + svc_handler->close (); + } } } - else - { - // Transport is not usable - transport = 0; - } } - // In case of errors transport is zero - if (transport == 0) + // Irrespective of success or failure, remove the extra #REFCOUNT#. + svc_handler->remove_reference (); + + // In case of errors. + if (result == -1) { // Give users a clue to the problem. if (TAO_debug_level) @@ -594,7 +623,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( ssl_endpoint->addr_to_string (buffer, sizeof (buffer) - 1); ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - SSL connection to ") + ACE_TEXT ("TAO (%P|%t) %N:%l, SSL connection to ") ACE_TEXT ("<%s:%d> failed (%p)\n"), buffer, remote_address.get_port_number (), @@ -608,11 +637,14 @@ TAO::SSLIOP::Connector::ssliop_connect ( // #REFCOUNT# is one. if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, " + "TAO (%P|%t) - SSLIOP_Connector::ssliop_connect(): " "new SSL connection to port %d on transport[%d]\n", remote_address.get_port_number (), svc_handler->peer ().get_handle ())); + transport = + svc_handler->transport (); + ssl_endpoint->qop (qop); ssl_endpoint->trust (trust); ssl_endpoint->credentials (credentials.in ()); @@ -632,31 +664,34 @@ TAO::SSLIOP::Connector::ssliop_connect ( if (TAO_debug_level > 0) { ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - SLIIOP_Connector::ssliop_connect, " + "TAO (%P|%t) - IIOP_Connector::make_connection, " "could not add the new connection to cache\n")); } return 0; } - if (transport->is_connected () && - transport->wait_strategy ()->register_handler () != 0) - { - // Registration failures. + // If the wait strategy wants us to be registered with the reactor + // then we do so. If registeration is required and it succeeds, + // #REFCOUNT# becomes two. + retval = transport->wait_strategy ()->register_handler (); - // Purge from the connection cache, if we are not in the cache, this - // just does nothing. - (void) transport->purge_entry (); + // Registration failures. + if (retval != 0) + { + // Purge from the connection cache. + transport->purge_entry (); // Close the handler. - (void) transport->close_connection (); + svc_handler->close (); if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - SSLIOP_Connector [%d]::ssliop_connect, " - "could not register the transport " - "in the reactor.\n", - transport->id ())); + { + ACE_ERROR ((LM_ERROR, + "TAO (%P|%t) - IIOP_Connector::make_connection, " + "could not register the new connection in the " + "reactor\n")); + } return 0; } @@ -725,12 +760,6 @@ TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub, // Use the default certificate and private key, i.e. the one set // in the SSL_CTX that was used when creating the SSL data // structure. - - /** - * @todo Check if the CredentialsCurator contains a default set - * of SSLIOP OwnCredentials. - */ - TAO::SSLIOP::OwnCredentials_ptr & c = ssliop_credentials.out (); ACE_NEW_THROW_EX (c, TAO::SSLIOP::OwnCredentials ( @@ -742,23 +771,3 @@ TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub, return ssliop_credentials._retn (); } - -int -TAO::SSLIOP::Connector::cancel_svc_handler ( - TAO_Connection_Handler * svc_handler) -{ - TAO::SSLIOP::Connection_Handler* handler= - dynamic_cast<TAO::SSLIOP::Connection_Handler*>(svc_handler); - - if (handler) - { - // Cancel from the connector - this->base_connector_.cancel (handler); - - return 0; - } - else - { - return -1; - } -} diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h index 9a3a5ddb1a2..85e4362153c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h @@ -81,9 +81,6 @@ namespace TAO */ virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL); - /// Cancel the passed cvs handler from the connector - virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler); - /// IIOP-specific connection establishment. /** * @note The IIOP endpoint is extracted from the SSLIOP endpoint. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp index 163f86e28e6..268cc69b796 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp @@ -2,6 +2,8 @@ #include "tao/ORB_Constants.h" +//#include <openssl/bn.h> + ACE_RCSID (SSLIOP, SSLIOP_Credentials, @@ -13,9 +15,9 @@ ACE_RCSID (SSLIOP, #endif /* __ACE_INLINE__ */ -TAO::SSLIOP_Credentials::SSLIOP_Credentials (::X509 *cert, ::EVP_PKEY *evp) - : x509_ (TAO::SSLIOP::OpenSSL_traits< ::X509 >::_duplicate (cert)), - evp_ (TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::_duplicate (evp)), +TAO::SSLIOP::Credentials::Credentials (::X509 *cert, ::EVP_PKEY *evp) + : x509_ (TAO::SSLIOP::_duplicate (cert)), + evp_ (TAO::SSLIOP::_duplicate (evp)), id_ (), creds_usage_ (SecurityLevel3::CU_Indefinite), expiry_time_ (), @@ -74,33 +76,33 @@ TAO::SSLIOP_Credentials::SSLIOP_Credentials (::X509 *cert, ::EVP_PKEY *evp) } } -TAO::SSLIOP_Credentials::~SSLIOP_Credentials (void) +TAO::SSLIOP::Credentials::~Credentials (void) { } char * -TAO::SSLIOP_Credentials::creds_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::SSLIOP::Credentials::creds_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->id_.in ()); } SecurityLevel3::CredentialsUsage -TAO::SSLIOP_Credentials::creds_usage (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::SSLIOP::Credentials::creds_usage (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return SecurityLevel3::CU_Indefinite; } TimeBase::UtcT -TAO::SSLIOP_Credentials::expiry_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::SSLIOP::Credentials::expiry_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->expiry_time_; } SecurityLevel3::CredentialsState -TAO::SSLIOP_Credentials::creds_state (ACE_ENV_SINGLE_ARG_DECL) +TAO::SSLIOP::Credentials::creds_state (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { const ::X509 *x = this->x509_.in (); @@ -148,7 +150,7 @@ TAO::SSLIOP_Credentials::creds_state (ACE_ENV_SINGLE_ARG_DECL) } char * -TAO::SSLIOP_Credentials::add_relinquished_listener ( +TAO::SSLIOP::Credentials::add_relinquished_listener ( SecurityLevel3::RelinquishedCredentialsListener_ptr /* listener */ ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -157,7 +159,7 @@ TAO::SSLIOP_Credentials::add_relinquished_listener ( } void -TAO::SSLIOP_Credentials::remove_relinquished_listener (const char * /* id */ +TAO::SSLIOP::Credentials::remove_relinquished_listener (const char * /* id */ ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -165,58 +167,40 @@ TAO::SSLIOP_Credentials::remove_relinquished_listener (const char * /* id */ } bool -TAO::SSLIOP_Credentials::operator== (const TAO::SSLIOP_Credentials &rhs) +TAO::SSLIOP::Credentials::operator== (const TAO::SSLIOP::Credentials &rhs) { - ::X509 * xa = this->x509_.in (); - ::X509 * xb = rhs.x509_.in (); + X509 * xa = this->x509_.in (); + X509 * xb = rhs.x509_.in (); // EVP_PKEY *ea = this->evp_.in (); // EVP_PKEY *eb = rhs.evp_.in (); - ACE_DECLARE_NEW_CORBA_ENV; - // No need for a full blown ACE_TRY/CATCH block. - - const SecurityLevel3::CredentialsType lct = - this->creds_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); - - const SecurityLevel3::CredentialsType rct = - const_cast<TAO::SSLIOP_Credentials &> (rhs).creds_type ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); - - // Don't bother check the creds_id and expiry_time attributes. They - // are checked implicitly by the below X509_cmp() call. - // - // Additionally, the creds_state attribute is not included in the - // check since it is not considered important when distinguishing - // between two Credentials. - return - lct == rct - && this->creds_usage_ == rhs.creds_usage_ - && ((xa == xb) || (xa != 0 && xb != 0 && ::X509_cmp (xa, xb) == 0)) +// this->accepting_options_supported_ == rhs.accepting_options_supported_ +// && this->accepting_options_required_ == rhs.accepting_options_required_ +// && this->invocation_options_supported_ == rhs.invocation_options_supported_ && this->invocation_options_required_ == rhs.invocation_options_required_ + ((xa == xb) || (xa != 0 && xb != 0 && ::X509_cmp (xa, xb) == 0)) // && ((ea == eb) || (ea != 0 && eb != 0 && ::EVP_PKEY_cmp (ea, eb) == 0)) ; } CORBA::ULong -TAO::SSLIOP_Credentials::hash (void) const +TAO::SSLIOP::Credentials::hash (void) const { - ::X509 * x509 = this->x509_.in (); + ::X509 *x509 = this->x509_.in (); return (x509 == 0 ? 0 : ::X509_issuer_name_hash (x509)); } TAO::SSLIOP::Credentials_ptr -TAO::SSLIOP_Credentials::_narrow (CORBA::Object_ptr obj +TAO::SSLIOP::Credentials::_narrow (CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED) { - return TAO::SSLIOP_Credentials::_duplicate ( - dynamic_cast<TAO::SSLIOP_Credentials *> (obj)); + return TAO::SSLIOP::Credentials::_duplicate ( + dynamic_cast<TAO::SSLIOP::Credentials *> (obj)); } TAO::SSLIOP::Credentials_ptr -TAO::SSLIOP_Credentials::_duplicate (TAO::SSLIOP::Credentials_ptr obj) +TAO::SSLIOP::Credentials::_duplicate (TAO::SSLIOP::Credentials_ptr obj) { if (!CORBA::is_nil (obj)) obj->_add_ref (); @@ -229,7 +213,7 @@ TAO::SSLIOP_Credentials::_duplicate (TAO::SSLIOP::Credentials_ptr obj) TAO::SSLIOP::Credentials_ptr tao_TAO_SSLIOP_Credentials_duplicate (TAO::SSLIOP::Credentials_ptr p) { - return TAO::SSLIOP_Credentials::_duplicate (p); + return TAO::SSLIOP::Credentials::_duplicate (p); } void @@ -241,35 +225,22 @@ tao_TAO_SSLIOP_Credentials_release (TAO::SSLIOP::Credentials_ptr p) TAO::SSLIOP::Credentials_ptr tao_TAO_SSLIOP_Credentials_nil (void) { - return TAO::SSLIOP_Credentials::_nil (); + return TAO::SSLIOP::Credentials::_nil (); } TAO::SSLIOP::Credentials_ptr tao_TAO_SSLIOP_Credentials_narrow (CORBA::Object *p ACE_ENV_ARG_DECL) { - return TAO::SSLIOP_Credentials::_narrow (p - ACE_ENV_ARG_PARAMETER); + return TAO::SSLIOP::Credentials::_narrow (p + ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr tao_TAO_SSLIOP_Credentials_upcast (void *src) { - TAO::SSLIOP_Credentials **tmp = - static_cast<TAO::SSLIOP_Credentials **> (src); + TAO::SSLIOP::Credentials **tmp = + static_cast<TAO::SSLIOP::Credentials **> (src); return *tmp; } - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_Pseudo_Var_T<TAO::SSLIOP_Credentials>; -template class TAO_Pseudo_Out_T<TAO::SSLIOP_Credentials, TAO::SSLIOP_Credentials_var>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate TAO_Pseudo_Var_T<TAO::SSLIOP_Credentials> -# pragma instantiate TAO_Pseudo_Out_T<TAO::SSLIOP_Credentials, TAO::SSLIOP_Credentials_var> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index 89b27c15a62..4a53212775d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -23,43 +23,36 @@ #include "SSLIOP_X509.h" #include "SSLIOP_EVP_PKEY.h" -#include "orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" namespace TAO { - class SSLIOP_Credentials; + namespace SSLIOP + { - namespace SSLIOP - { - typedef SSLIOP_Credentials* Credentials_ptr; - typedef TAO_Pseudo_Var_T<SSLIOP_Credentials> Credentials_var; - typedef TAO_Pseudo_Out_T<SSLIOP_Credentials, Credentials_var> Credentials_out; - } + class Credentials; + typedef Credentials* Credentials_ptr; + typedef TAO_Pseudo_Var_T<Credentials> Credentials_var; + typedef TAO_Pseudo_Out_T<Credentials, Credentials_var> Credentials_out; /** - * @class SSLIOP_Credentials + * @class Credentials * * @brief SSLIOP-specific implementation of the * SecurityLevel3::Credentials interface. * * This class encapsulates the X.509 certificate associated with a * given a principal. - * - * @note Why is this class not the TAO::SSLIOP namespace? Because - * brain damaged MSVC++ 6 cannot call a base class - * constructor of class declared in a namespace that is more - * than one level deep in a sub-class base member - * initializer list. */ - class TAO_SSLIOP_Export SSLIOP_Credentials + class TAO_SSLIOP_Export Credentials : public virtual SecurityLevel3::Credentials, public virtual TAO_Local_RefCounted_Object { public: /// Constructor - SSLIOP_Credentials (::X509 * cert, ::EVP_PKEY * evp); + Credentials (::X509 * cert, ::EVP_PKEY * evp); /** * @name SecurityLevel3::Credentials Methods @@ -116,19 +109,19 @@ namespace TAO ::EVP_PKEY *evp (void); //@} - bool operator== (const SSLIOP_Credentials &rhs); + bool operator== (const Credentials &rhs); CORBA::ULong hash (void) const; // The static operations. - static SSLIOP::Credentials_ptr _duplicate (SSLIOP::Credentials_ptr obj); + static Credentials_ptr _duplicate (Credentials_ptr obj); - static SSLIOP::Credentials_ptr _narrow (CORBA::Object_ptr obj - ACE_ENV_ARG_DECL); + static Credentials_ptr _narrow (CORBA::Object_ptr obj + ACE_ENV_ARG_DECL); - static SSLIOP::Credentials_ptr _nil (void) + static Credentials_ptr _nil (void) { - return (SSLIOP::Credentials_ptr) 0; + return (Credentials_ptr) 0; } //@} @@ -140,17 +133,17 @@ namespace TAO * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~SSLIOP_Credentials (void); + ~Credentials (void); protected: /// Reference to the X.509 certificate associated with this SSLIOP /// Credentials object. - SSLIOP::X509_var x509_; + X509_var x509_; /// Reference to the private key associated with the X.509 /// certificate. - SSLIOP::EVP_PKEY_var evp_; + EVP_PKEY_var evp_; /// Credentials Identifier. CORBA::String_var id_; @@ -166,7 +159,7 @@ namespace TAO }; -// } // End SSLIOP namespace + } // End SSLIOP namespace } // End TAO namespace #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl index 8c353c74cff..e33e9380658 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl @@ -3,15 +3,13 @@ // $Id$ ACE_INLINE ::X509 * -TAO::SSLIOP_Credentials::x509 (void) +TAO::SSLIOP::Credentials::x509 (void) { - return - TAO::SSLIOP::OpenSSL_traits< ::X509 >::_duplicate (this->x509_.in ()); + return TAO::SSLIOP::_duplicate (this->x509_.in ()); } ACE_INLINE ::EVP_PKEY * -TAO::SSLIOP_Credentials::evp (void) +TAO::SSLIOP::Credentials::evp (void) { - return - TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::_duplicate (this->evp_.in ()); + return TAO::SSLIOP::_duplicate (this->evp_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp index 088255970f4..d2eef3da6bf 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp @@ -32,7 +32,7 @@ TAO_SSLIOP_password_callback (char *buf, // what you get when you try to be overly efficient. :-) // -Ossama - const char * password = static_cast<char *> (userdata); + const char *password = static_cast<char *> (userdata); int pwlen = -1; @@ -41,7 +41,7 @@ TAO_SSLIOP_password_callback (char *buf, pwlen = ACE_OS::strlen (password); int copy_len = pwlen + 1; // Include the NULL terminator - + // Clear the portion of the buffer that exceeds the space that // will be occupied by the password. if (copy_len < size) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h index e1d1e5778bf..4a391c83497 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h @@ -15,16 +15,16 @@ #define TAO_SSLIOP_CREDENTIALS_ACQUIRER_H #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Security/SL3_CredentialsCurator.h" +#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h" -#include "orbsvcs/SSLIOPC.h" -#include "orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/orbsvcs/SSLIOPC.h" +#include "orbsvcs/orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h index 6918b068b0d..791dcde0da5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h @@ -16,15 +16,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h" +#include "orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h" -#include "orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/orbsvcs/SecurityLevel3C.h" namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp index 9b18545640b..0b458f46647 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp @@ -114,7 +114,7 @@ TAO::SSLIOP::Current::setup (TAO::SSLIOP::Current_Impl *&prev_impl, void TAO::SSLIOP::Current::teardown (TAO::SSLIOP::Current_Impl *prev_impl, - bool &setup_done) + bool &setup_done) { if (setup_done) { @@ -193,13 +193,128 @@ tao_TAO_SSLIOP_Current_upcast ( return *tmp; } +// ************************************************************* +// Operations for class TAO::SSLIOP::Current_var +// ************************************************************* -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +TAO::SSLIOP::Current_var::Current_var (void) // default constructor + : ptr_ (TAO::SSLIOP::Current::_nil ()) +{ +} + +::TAO::SSLIOP::Current_ptr +TAO::SSLIOP::Current_var::ptr (void) const +{ + return this->ptr_; +} + +TAO::SSLIOP::Current_var::Current_var ( + const ::TAO::SSLIOP::Current_var &p) + : TAO_Base_var (), + ptr_ (TAO::SSLIOP::Current::_duplicate (p.ptr ())) +{ +} + +TAO::SSLIOP::Current_var::~Current_var (void) +{ + CORBA::release (this->ptr_); +} + +TAO::SSLIOP::Current_var & +TAO::SSLIOP::Current_var::operator= (TAO::SSLIOP::Current_ptr p) +{ + CORBA::release (this->ptr_); + this->ptr_ = p; + return *this; +} + +TAO::SSLIOP::Current_var & +TAO::SSLIOP::Current_var::operator= (const ::TAO::SSLIOP::Current_var &p) +{ + if (this != &p) + { + CORBA::release (this->ptr_); + this->ptr_ = ::TAO::SSLIOP::Current::_duplicate (p.ptr ()); + } + return *this; +} + +TAO::SSLIOP::Current_var::operator const ::TAO::SSLIOP::Current_ptr &() const +{ + return this->ptr_; +} + +TAO::SSLIOP::Current_var::operator ::TAO::SSLIOP::Current_ptr &() +{ + return this->ptr_; +} + +::TAO::SSLIOP::Current_ptr +TAO::SSLIOP::Current_var::operator-> (void) const +{ + return this->ptr_; +} + +::TAO::SSLIOP::Current_ptr +TAO::SSLIOP::Current_var::in (void) const +{ + return this->ptr_; +} -template class TAO_Pseudo_Var_T<TAO::SSLIOP::Current>; +::TAO::SSLIOP::Current_ptr & +TAO::SSLIOP::Current_var::inout (void) +{ + return this->ptr_; +} -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +::TAO::SSLIOP::Current_ptr & +TAO::SSLIOP::Current_var::out (void) +{ + CORBA::release (this->ptr_); + this->ptr_ = ::TAO::SSLIOP::Current::_nil (); + return this->ptr_; +} -# pragma instantiate TAO_Pseudo_Var_T<TAO::SSLIOP::Current> +::TAO::SSLIOP::Current_ptr +TAO::SSLIOP::Current_var::_retn (void) +{ + // yield ownership of managed obj reference + ::TAO::SSLIOP::Current_ptr val = this->ptr_; + this->ptr_ = ::TAO::SSLIOP::Current::_nil (); + return val; +} -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +::TAO::SSLIOP::Current_ptr +TAO::SSLIOP::Current_var::tao_duplicate (TAO::SSLIOP::Current_ptr p) +{ + return ::TAO::SSLIOP::Current::_duplicate (p); +} + +void +TAO::SSLIOP::Current_var::tao_release (TAO::SSLIOP::Current_ptr p) +{ + CORBA::release (p); +} + +::TAO::SSLIOP::Current_ptr +TAO::SSLIOP::Current_var::tao_nil (void) +{ + return ::TAO::SSLIOP::Current::_nil (); +} + +::TAO::SSLIOP::Current_ptr +TAO::SSLIOP::Current_var::tao_narrow ( + CORBA::Object *p + ACE_ENV_ARG_DECL + ) +{ + return ::TAO::SSLIOP::Current::_narrow (p ACE_ENV_ARG_PARAMETER); +} + +CORBA::Object * +TAO::SSLIOP::Current_var::tao_upcast (void *src) +{ + TAO::SSLIOP::Current **tmp = + static_cast<TAO::SSLIOP::Current **> (src); + return *tmp; +} diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index 1921057cfc4..1ff1ab76fb4 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -23,7 +23,7 @@ #include "SSLIOP_Current_Impl.h" -#include "orbsvcs/SSLIOPC.h" +#include "orbsvcs/orbsvcs/SSLIOPC.h" #include "tao/ORB_Core.h" // This is to remove "inherits via dominance" warnings from MSVC. @@ -41,8 +41,8 @@ namespace TAO namespace SSLIOP { class Current; + class Current_var; typedef Current * Current_ptr; - typedef TAO_Pseudo_Var_T<Current> Current_var; /** * @class Current @@ -112,12 +112,24 @@ namespace TAO * compiler for all IDL interfaces. */ //@{ +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef Current_ptr _ptr_type; + typedef Current_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + + static int _tao_class_id; + // The static operations. static Current_ptr _duplicate (Current_ptr obj); static Current_ptr _narrow (CORBA::Object_ptr obj ACE_ENV_ARG_DECL); + + static Current_ptr _unchecked_narrow (CORBA::Object_ptr obj + ACE_ENV_ARG_DECL); + + static Current_ptr _nil (void) { return (Current_ptr)0; @@ -157,6 +169,42 @@ namespace TAO }; + class Current_var : public TAO_Base_var + { + public: + Current_var (void); // default constructor + Current_var (Current_ptr p) : ptr_ (p) {} + Current_var (const Current_var &); // copy constructor + ~Current_var (void); // destructor + + Current_var &operator= (Current_ptr); + Current_var &operator= (const Current_var &); + Current_ptr operator-> (void) const; + + operator const Current_ptr &() const; + operator Current_ptr &(); + // in, inout, out, _retn + Current_ptr in (void) const; + Current_ptr &inout (void); + Current_ptr &out (void); + Current_ptr _retn (void); + Current_ptr ptr (void) const; + + // Hooks used by template sequence and object manager classes + // for non-defined forward declared interfaces. + static Current_ptr tao_duplicate (Current_ptr); + static void tao_release (Current_ptr); + static Current_ptr tao_nil (void); + static Current_ptr tao_narrow (CORBA::Object * + ACE_ENV_ARG_DECL); + static CORBA::Object * tao_upcast (void *); + + private: + Current_ptr ptr_; + // Unimplemented - prevents widening assignment. + Current_var (const TAO_Base_var &rhs); + Current_var &operator= (const TAO_Base_var &rhs); + }; } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp index eb7ff19899a..ee65fa48380 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp @@ -34,9 +34,7 @@ TAO::SSLIOP::Current_Impl::client_credentials ( SecurityLevel3::ClientCredentials_ptr creds; ACE_NEW_THROW_EX (creds, - TAO::SSLIOP::ClientCredentials (cert.in (), - 0, - this->ssl_), + TAO::SSLIOP::ClientCredentials (cert.in (), 0), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( TAO_DEFAULT_MINOR_CODE, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h index 5502393a62b..6ba6569f23b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h @@ -21,8 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOPC.h" -#include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h" +#include "orbsvcs/orbsvcs/SSLIOPC.h" +#include "orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h" #include "tao/ORB_Core.h" #include <openssl/ssl.h> diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp index 1f95833d035..2f461de27f1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp @@ -2,81 +2,12 @@ #include "SSLIOP_EVP_PKEY.h" -#include <openssl/x509.h> -#include <openssl/rsa.h> -#include <openssl/dsa.h> -#include <openssl/dh.h> - ACE_RCSID (SSLIOP, SSLIOP_EVP_PKEY, "$Id$") -::EVP_PKEY * -TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key) -{ - ::EVP_PKEY * pkey = const_cast< ::EVP_PKEY *> (&key); - - // We're using the EVP_PKEY_var even though it depends on this - // trait function. This works since we're not actually using - // any of the EVP_PKEY_var methods that call this copy() - // trait. This allows us to maintain exception safety. - TAO::SSLIOP::EVP_PKEY_var p = ::EVP_PKEY_new (); - - switch (::EVP_PKEY_type (pkey->type)) - { - case EVP_PKEY_RSA: - { - RSA * rsa = ::EVP_PKEY_get1_RSA (pkey); - if (rsa != 0) - { - // Not exception safe! - ::EVP_PKEY_set1_RSA (p.in (), RSAPrivateKey_dup (rsa)); - ::RSA_free (rsa); - } - } - break; - - case EVP_PKEY_DSA: - { - DSA * dsa = ::EVP_PKEY_get1_DSA (pkey); - if (dsa != 0) - { - // Not exception safe! - ::EVP_PKEY_set1_DSA (p.in (), DSAparams_dup (dsa)); - ::DSA_free (dsa); - } - } - break; - - case EVP_PKEY_DH: - { - DH * dh = ::EVP_PKEY_get1_DH (pkey); - if (dh != 0) - { - // Not exception safe! - ::EVP_PKEY_set1_DH (p.in (), DHparams_dup (dh)); - ::DH_free (dh); - } - } - break; - - default: - // We should never get here! - return 0; - } - - return p._retn (); -} - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO::SSLIOP::OpenSSL_st_var< ::EVP_PKEY >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate TAO::SSLIOP::OpenSSL_st_var< ::EVP_PKEY > - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#if !defined (__ACE_INLINE__) +#include "SSLIOP_EVP_PKEY.inl" +#endif /* !__ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h index 903828b73d5..a316efd37c7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h @@ -6,7 +6,7 @@ * * $Id$ * - * @author Ossama Othman <ossama@dre,vanderbilt.edu> + * @author Ossama Othman <ossama@uci.edu> */ //============================================================================= @@ -21,56 +21,83 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_OpenSSL_st_T.h" +#include "tao/varbase.h" -#include <openssl/evp.h> #include <openssl/crypto.h> - +#include <openssl/evp.h> namespace TAO { namespace SSLIOP { - // OpenSSL @c EVP_PKEY structure traits specialization. - template <> - struct OpenSSL_traits< ::EVP_PKEY > + /** + * @name CORBA-style Reference Count Manipulation Methods + */ + /// Increase the reference count on the given EVP_PKEY structure. + ::EVP_PKEY *_duplicate (::EVP_PKEY *key); + + /// Decrease the reference count on the given EVP_PKEY structure. + void release (::EVP_PKEY *key); + + /** + * @class EVP_PKEY_var + * + * @brief "_var" class for the OpenSSL @param EVP_PKEY structure. + * + * This class is simply used to make operations on instances of + * the OpenSSL @param EVP_PKEY structures exception safe. It is + * only used internally by the SSLIOP pluggable protocol. + */ + class EVP_PKEY_var : private TAO_Base_var { - /// OpenSSL lock ID for use in OpenSSL CRYPTO_add() reference - /// count manipulation function. - enum { LOCK_ID = CRYPTO_LOCK_EVP_PKEY }; + public: - /// Increase the reference count on the given OpenSSL structure. /** - * @note This used to be in a function template but MSVC++ 6 - * can't handle function templates correctly so reproduce - * the code in each specialization. *sigh* + * @name Constructors */ - static ::EVP_PKEY * _duplicate (::EVP_PKEY * st) - { - if (st != 0) - CRYPTO_add (&(st->references), - 1, - LOCK_ID); - - return st; - } - - /// Perform deep copy of the given OpenSSL structure. - static ::EVP_PKEY * copy (::EVP_PKEY const & key); - - /// Decrease the reference count on the given OpenSSL - /// structure. - static void release (::EVP_PKEY * st) - { - ::EVP_PKEY_free (st); - } - }; + //@{ + EVP_PKEY_var (void); + EVP_PKEY_var (::EVP_PKEY *x); + EVP_PKEY_var (const EVP_PKEY_var &); + //@} + + /// Destructor + ~EVP_PKEY_var (void); + + EVP_PKEY_var &operator= (::EVP_PKEY *); + EVP_PKEY_var &operator= (const EVP_PKEY_var &); + const ::EVP_PKEY *operator-> (void) const; + ::EVP_PKEY *operator-> (void); + + operator const ::EVP_PKEY &() const; + operator ::EVP_PKEY &(); - typedef OpenSSL_st_var< ::EVP_PKEY > EVP_PKEY_var; + ::EVP_PKEY *in (void) const; + ::EVP_PKEY *&inout (void); + ::EVP_PKEY *&out (void); + ::EVP_PKEY *_retn (void); + ::EVP_PKEY *ptr (void) const; + + private: + + // Unimplemented - prevents widening assignment. + EVP_PKEY_var (const TAO_Base_var &rhs); + EVP_PKEY_var &operator= (const TAO_Base_var &rhs); + + private: + + /// The OpenSSL @c EVP_PKEY structure that represents a private + /// key. + ::EVP_PKEY *evp_; + + }; } // End SSLIOP namespace. } // End TAO namespace. +#if defined (__ACE_INLINE__) +#include "SSLIOP_EVP_PKEY.inl" +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.inl new file mode 100644 index 00000000000..e20b30e774d --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.inl @@ -0,0 +1,129 @@ +// -*- C++ -*- +// +// $Id$ + +ACE_INLINE ::EVP_PKEY * +TAO::SSLIOP::_duplicate (::EVP_PKEY *key) +{ + // OpenSSL provides no function to increase the reference count on + // the EVP_PKEY structure, so we do it manually. + if (key != 0) + CRYPTO_add (&(key->references), 1, CRYPTO_LOCK_EVP_PKEY); + + return key; +} + +ACE_INLINE void +TAO::SSLIOP::release (::EVP_PKEY *key) +{ + // OpenSSL's EVP_PKEY_free() function already handles reference + // counting properly. + ::EVP_PKEY_free (key); +} + + +// ------------------------------------------------------------------- + +ACE_INLINE +TAO::SSLIOP::EVP_PKEY_var::EVP_PKEY_var (void) + : evp_ (0) +{ +} + +ACE_INLINE +TAO::SSLIOP::EVP_PKEY_var::EVP_PKEY_var (::EVP_PKEY *x) + : evp_ (x) +{ +} + +ACE_INLINE +TAO::SSLIOP::EVP_PKEY_var::EVP_PKEY_var (const TAO::SSLIOP::EVP_PKEY_var &p) + : TAO_Base_var (), + evp_ (TAO::SSLIOP::_duplicate (p.ptr ())) +{ +} + +ACE_INLINE +TAO::SSLIOP::EVP_PKEY_var::~EVP_PKEY_var (void) +{ + TAO::SSLIOP::release (this->evp_); +} + +ACE_INLINE TAO::SSLIOP::EVP_PKEY_var & +TAO::SSLIOP::EVP_PKEY_var::operator= (::EVP_PKEY *p) +{ + TAO::SSLIOP::release (this->evp_); + this->evp_ = p; + return *this; +} + +ACE_INLINE TAO::SSLIOP::EVP_PKEY_var & +TAO::SSLIOP::EVP_PKEY_var::operator= (const TAO::SSLIOP::EVP_PKEY_var &p) +{ + if (this != &p) + { + TAO::SSLIOP::release (this->evp_); + this->evp_ = TAO::SSLIOP::_duplicate (p.ptr ()); + } + + return *this; +} + +ACE_INLINE const ::EVP_PKEY * +TAO::SSLIOP::EVP_PKEY_var::operator-> (void) const +{ + return this->evp_; +} + +ACE_INLINE ::EVP_PKEY * +TAO::SSLIOP::EVP_PKEY_var::operator-> (void) +{ + return this->evp_; +} + +ACE_INLINE +TAO::SSLIOP::EVP_PKEY_var::operator const ::EVP_PKEY &() const +{ + return *this->evp_; +} + +ACE_INLINE +TAO::SSLIOP::EVP_PKEY_var::operator ::EVP_PKEY &() +{ + return *this->evp_; +} + +ACE_INLINE ::EVP_PKEY * +TAO::SSLIOP::EVP_PKEY_var::in (void) const +{ + return this->evp_; +} + +ACE_INLINE ::EVP_PKEY *& +TAO::SSLIOP::EVP_PKEY_var::inout (void) +{ + return this->evp_; +} + +ACE_INLINE ::EVP_PKEY *& +TAO::SSLIOP::EVP_PKEY_var::out (void) +{ + EVP_PKEY_free (this->evp_); + this->evp_ = 0; + return this->evp_; +} + +ACE_INLINE ::EVP_PKEY * +TAO::SSLIOP::EVP_PKEY_var::_retn (void) +{ + // Yield ownership of the EVP_PKEY structure. + ::EVP_PKEY *x = this->evp_; + this->evp_ = 0; + return x; +} + +ACE_INLINE ::EVP_PKEY * +TAO::SSLIOP::EVP_PKEY_var::ptr (void) const +{ + return this->evp_; +} diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp index 3493cd303a9..0816283f5c9 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp @@ -15,7 +15,7 @@ ACE_RCSID (SSLIOP, #endif /* __ACE_INLINE__ */ TAO_SSLIOP_Endpoint::TAO_SSLIOP_Endpoint (const ::SSLIOP::SSL *ssl_component, - TAO_IIOP_Endpoint *iiop_endp) + TAO_IIOP_Endpoint *iiop_endp) : TAO_Endpoint (IOP::TAG_INTERNET_IOP), object_addr_ (), next_ (0), diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h index fdd3490f063..d4060f8c02a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h @@ -24,10 +24,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_OwnCredentials.h" +#include "SSLIOP_Credentials.h" -#include "orbsvcs/SSLIOPC.h" -#include "orbsvcs/SecurityC.h" +#include "orbsvcs/orbsvcs/SSLIOPC.h" +#include "orbsvcs/orbsvcs/SecurityC.h" #include "tao/IIOP_Endpoint.h" #include "ace/INET_Addr.h" @@ -123,7 +123,7 @@ namespace TAO ::Security::EstablishTrust trust (void) const; /// Set the credentials for this endpoint. - void credentials (TAO::SSLIOP::OwnCredentials_ptr creds); + void credentials (TAO::SSLIOP::Credentials_ptr creds); /// Get the credentials for this endpoint. /** @@ -133,7 +133,7 @@ namespace TAO * that no additional locks occur when checking the * transport cache. */ - TAO::SSLIOP::OwnCredentials * credentials (void) const; + TAO::SSLIOP::Credentials * credentials (void) const; //@} private: @@ -169,7 +169,7 @@ namespace TAO ::Security::EstablishTrust trust_; /// SSLIOP-specific credentials for this endpoint object. - TAO::SSLIOP::OwnCredentials_var credentials_; + TAO::SSLIOP::Credentials_var credentials_; }; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i index 4fa34d67f41..eb58d3dcc56 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i @@ -68,12 +68,12 @@ TAO_SSLIOP_Endpoint::trust (void) const } ACE_INLINE void -TAO_SSLIOP_Endpoint::credentials (const TAO::SSLIOP::OwnCredentials_ptr creds) +TAO_SSLIOP_Endpoint::credentials (const TAO::SSLIOP::Credentials_ptr creds) { - this->credentials_ = TAO::SSLIOP::OwnCredentials::_duplicate (creds); + this->credentials_ = TAO::SSLIOP::Credentials::_duplicate (creds); } -ACE_INLINE TAO::SSLIOP::OwnCredentials * +ACE_INLINE TAO::SSLIOP::Credentials * TAO_SSLIOP_Endpoint::credentials (void) const { return this->credentials_.in (); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index fbb32f89f96..390ab77de3c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -4,7 +4,7 @@ #include "SSLIOP_ORBInitializer.h" #include "ace/OS_NS_strings.h" -#include "orbsvcs/Security/Security_ORBInitializer.h" /// @todo should go away +#include "orbsvcs/orbsvcs/Security/Security_ORBInitializer.h" /// @todo should go away //#include "orbsvcs/CSIIOPC.h" @@ -74,7 +74,7 @@ TAO::SSLIOP::Protocol_Factory::make_acceptor (void) int TAO::SSLIOP::Protocol_Factory::init (int argc, - char* argv[]) + char* argv[]) { char *certificate_path = 0; char *private_key_path = 0; @@ -473,7 +473,6 @@ TAO::SSLIOP::Protocol_Factory::requires_explicit_endpoint (void) const return 0; } - ACE_STATIC_SVC_DEFINE (TAO_SSLIOP_Protocol_Factory, ACE_TEXT ("SSLIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h index 73a16174959..a80578eb718 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h @@ -25,8 +25,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SecurityC.h" -#include "orbsvcs/CSIIOPC.h" +#include "orbsvcs/orbsvcs/SecurityC.h" +#include "orbsvcs/orbsvcs/CSIIOPC.h" #include "tao/Protocol_Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h index 9e47848971a..45740ab8cd0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SSLIOPC.h" +#include "orbsvcs/orbsvcs/SSLIOPC.h" #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index efa08eeb608..d7fe7e70c57 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -11,11 +11,11 @@ ACE_RCSID (SSLIOP, //#include "SSLIOP_IORInterceptor.h" #include "SSLIOP_CredentialsAcquirerFactory.h" -#include "orbsvcs/Security/SL3_SecurityCurrent.h" -#include "orbsvcs/Security/SL3_CredentialsCurator.h" +#include "orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h" +#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h" -#include "orbsvcs/SSLIOPC.h" -#include "orbsvcs/CSIIOPC.h" +#include "orbsvcs/orbsvcs/SSLIOPC.h" +#include "orbsvcs/orbsvcs/CSIIOPC.h" #include "tao/Exception.h" #include "tao/ORBInitInfo.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h index 544208d40b7..01f626a049d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h @@ -22,8 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CSIIOPC.h" -#include "orbsvcs/SecurityC.h" +#include "orbsvcs/orbsvcs/CSIIOPC.h" +#include "orbsvcs/orbsvcs/SecurityC.h" #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp index 4205fcb5cee..8541a3771fb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp @@ -9,7 +9,7 @@ ACE_RCSID (SSLIOP, TAO::SSLIOP::OwnCredentials::OwnCredentials (X509 *cert, EVP_PKEY *evp) - : SSLIOP_Credentials (cert, evp) + : TAO::SSLIOP::Credentials (cert, evp) { } @@ -71,15 +71,3 @@ TAO::SSLIOP::OwnCredentials::release_credentials ( { this->creds_state_ = SecurityLevel3::CS_PendingRelease; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_Pseudo_Var_T<TAO::SSLIOP::OwnCredentials>; -template class TAO_Pseudo_Out_T<TAO::SSLIOP::OwnCredentials, TAO::SSLIOP::OwnCredentials_var>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate TAO_Pseudo_Var_T<TAO::SSLIOP::OwnCredentials> -# pragma instantiate TAO_Pseudo_Out_T<TAO::SSLIOP::OwnCredentials, TAO::SSLIOP::OwnCredentials_var> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h index 2dfed018858..c973e328066 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h @@ -43,15 +43,15 @@ namespace TAO /** * @class OwnCredentials * - * @brief Credentials representing our identity, not our peer's - * identity. + * @brief Credentials representing the our identity, not our + * peer's identity. * * @c OwnCredentials are a representation of our identity, not our * peer's identity. */ class TAO_SSLIOP_Export OwnCredentials : public virtual SecurityLevel3::OwnCredentials, - public virtual SSLIOP_Credentials + public virtual Credentials { public: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp index dac7198565b..bce9948546c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp @@ -9,7 +9,7 @@ ACE_RCSID (SSLIOP, TAO::SSLIOP::TargetCredentials::TargetCredentials (::X509 *cert, ::EVP_PKEY *evp) - : SSLIOP_Credentials (cert, evp) + : TAO::SSLIOP::Credentials (cert, evp) { } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h index 98b4a75ec87..e4ae65b222f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h @@ -6,7 +6,7 @@ * * $Id$ * - * @author Ossama Othman <ossama@dre.vanderbilt.edu> + * @author Ossama Othman <ossama@uci.edu> */ //============================================================================= @@ -38,7 +38,7 @@ namespace TAO */ class TAO_SSLIOP_Export TargetCredentials : public virtual SecurityLevel3::TargetCredentials, - public virtual SSLIOP_Credentials + public virtual Credentials { public: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp index 036b2043a81..d16a4418066 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp @@ -6,12 +6,6 @@ ACE_RCSID (SSLIOP, "$Id$") -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO::SSLIOP::OpenSSL_st_var< ::X509 >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate TAO::SSLIOP::OpenSSL_st_var< ::X509 > - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#if !defined (__ACE_INLINE__) +#include "SSLIOP_X509.inl" +#endif /* !__ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h index 6937053169b..e80e4383d4f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h @@ -21,60 +21,86 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_OpenSSL_st_T.h" +#include "tao/varbase.h" #include <openssl/x509.h> #include <openssl/crypto.h> - namespace TAO { namespace SSLIOP { - // OpenSSL @c X509 structure traits specialization. - template <> - struct OpenSSL_traits< ::X509 > + /** + * @name CORBA-style Reference Count Manipulation Methods + */ + /// Increase the reference count on the given X509 structure. + ::X509 *_duplicate (::X509 *cert); + + /// Decrease the reference count on the given X509 structure. + void release (::X509 *cert); + + /** + * @class X509_var + * + * @brief "_var" class for the OpenSSL @param X509 structure. + * + * This class is simply used to make operations on instances of + * the OpenSSL @c X509 structures exception safe. It is only used + * internally by the SSLIOP pluggable protocol. + */ + class X509_var : private TAO_Base_var { - /// OpenSSL lock ID for use in OpenSSL CRYPTO_add() reference - /// count manipulation function. - enum { LOCK_ID = CRYPTO_LOCK_X509 }; + public: - /// Increase the reference count on the given OpenSSL structure. /** - * @note This used to be in a function template but MSVC++ 6 - * can't handle function templates correctly so reproduce - * the code in each specialization. *sigh* + * @name Constructors */ - static ::X509 * _duplicate (::X509 * st) - { - if (st != 0) - CRYPTO_add (&(st->references), - 1, - LOCK_ID); - - return st; - } - - /// Perform deep copy of the given OpenSSL structure. - static ::X509 * copy (::X509 const & st) - { - return ::X509_dup (const_cast< ::X509 *> (&st)); - } - - /// Decrease the reference count on the given OpenSSL - /// structure. - static void release (::X509 * st) - { - ::X509_free (st); - } - }; + //@{ + X509_var (void); + X509_var (::X509 *x); + X509_var (const X509_var &); + X509_var (const ::X509 &x); + //@} + + /// Destructor + ~X509_var (void); + + X509_var &operator= (::X509 *); + X509_var &operator= (const X509_var &); + X509_var &operator= (const ::X509 &); + const ::X509 *operator-> (void) const; + ::X509 *operator-> (void); + + operator const ::X509 &() const; + operator ::X509 &(); + + ::X509 *in (void) const; + ::X509 *&inout (void); + ::X509 *&out (void); + ::X509 *_retn (void); + ::X509 *ptr (void) const; - typedef OpenSSL_st_var< ::X509 > X509_var; + private: + // Unimplemented - prevents widening assignment. + X509_var (const TAO_Base_var &rhs); + X509_var &operator= (const TAO_Base_var &rhs); + + private: + + /// The OpenSSL X509 structure that represents a X.509 certificate. + ::X509 *x509_; + + }; } // End SSLIOP namespace. } // End TAO namespace. +#if defined (__ACE_INLINE__) +#include "SSLIOP_X509.inl" +#endif /* __ACE_INLINE__ */ + + #include /**/ "ace/post.h" #endif /* TAO_SSLIOP_X509_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.inl new file mode 100644 index 00000000000..f45342d12a0 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.inl @@ -0,0 +1,148 @@ +// -*- C++ -*- +// +// $Id$ + +ACE_INLINE ::X509 * +TAO::SSLIOP::_duplicate (::X509 *cert) +{ + // OpenSSL provides no function to increase the reference count on + // the X509 structure, so we do it manually. (X509_dup() performs a + // deep copy, not a shallow copy.) + if (cert != 0) + CRYPTO_add (&(cert->references), 1, CRYPTO_LOCK_X509); + + return cert; +} + +ACE_INLINE void +TAO::SSLIOP::release (::X509 *cert) +{ + // OpenSSL's X509_free() function already handles reference counting + // properly. + ::X509_free (cert); +} + + +// ------------------------------------------------------------------- + +ACE_INLINE +TAO::SSLIOP::X509_var::X509_var (void) + : x509_ (0) +{ +} + +ACE_INLINE +TAO::SSLIOP::X509_var::X509_var (::X509 *x) + : x509_ (x) +{ +} + +ACE_INLINE +TAO::SSLIOP::X509_var::X509_var (const TAO::SSLIOP::X509_var &p) + : TAO_Base_var (), + x509_ (TAO::SSLIOP::_duplicate (p.ptr ())) +{ +} + +ACE_INLINE +TAO::SSLIOP::X509_var::X509_var (const ::X509 &p) +{ + this->x509_ = X509_dup (const_cast< ::X509 * > (&p)); +} + +ACE_INLINE +TAO::SSLIOP::X509_var::~X509_var (void) +{ + TAO::SSLIOP::release (this->x509_); +} + +ACE_INLINE TAO::SSLIOP::X509_var & +TAO::SSLIOP::X509_var::operator= (::X509 *p) +{ + TAO::SSLIOP::release (this->x509_); + this->x509_ = p; + return *this; +} + +ACE_INLINE ::TAO::SSLIOP::X509_var & +TAO::SSLIOP::X509_var::operator= (const ::TAO::SSLIOP::X509_var &p) +{ + if (this != &p) + { + TAO::SSLIOP::release (this->x509_); + this->x509_ = TAO::SSLIOP::_duplicate (p.ptr ()); + } + + return *this; +} + +ACE_INLINE TAO::SSLIOP::X509_var & +TAO::SSLIOP::X509_var::operator= (const ::X509 &p) +{ + if (this->x509_ != &p) + { + TAO::SSLIOP::release (this->x509_); + this->x509_ = X509_dup (const_cast< ::X509 * > (&p)); + } + + return *this; +} + +ACE_INLINE const ::X509 * +TAO::SSLIOP::X509_var::operator-> (void) const +{ + return this->x509_; +} + +ACE_INLINE ::X509 * +TAO::SSLIOP::X509_var::operator-> (void) +{ + return this->x509_; +} + +ACE_INLINE +TAO::SSLIOP::X509_var::operator const ::X509 &() const +{ + return *this->x509_; +} + +ACE_INLINE +TAO::SSLIOP::X509_var::operator ::X509 &() +{ + return *this->x509_; +} + +ACE_INLINE ::X509 * +TAO::SSLIOP::X509_var::in (void) const +{ + return this->x509_; +} + +ACE_INLINE ::X509 *& +TAO::SSLIOP::X509_var::inout (void) +{ + return this->x509_; +} + +ACE_INLINE ::X509 *& +TAO::SSLIOP::X509_var::out (void) +{ + X509_free (this->x509_); + this->x509_ = 0; + return this->x509_; +} + +ACE_INLINE ::X509 * +TAO::SSLIOP::X509_var::_retn (void) +{ + // Yield ownership of the X509 structure. + ::X509 *x = this->x509_; + this->x509_ = 0; + return x; +} + +ACE_INLINE ::X509 * +TAO::SSLIOP::X509_var::ptr (void) const +{ + return this->x509_; +} diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h index e19b6659bf6..a4a7fc21cb0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h @@ -45,7 +45,7 @@ #include "tao/Sequence_T.h" #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" -#include "orbsvcs/SSLIOPC.h" +#include "orbsvcs/orbsvcs/SSLIOPC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl index 969aaad85f6..64feb29fa16 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl @@ -35,7 +35,7 @@ #ifndef _SSL_ENDPOINTS_IDL_ #define _SSL_ENDPOINTS_IDL_ -#include "orbsvcs/SSLIOP.idl" +#include "orbsvcs/orbsvcs/SSLIOP.idl" // Stores information for a collection of SSLIOP endpoints. typedef sequence <SSLIOP::SSL> TAO_SSLEndpointSequence; diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index a1bd57f1ae8..57be42611e4 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -4,8 +4,8 @@ // // ============================================================================ -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" #include "Config_Scheduler.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index abf9af35069..42500375d5b 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -11,15 +11,15 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "sched_export.h" #if defined (TAO_USES_STRATEGY_SCHEDULER) -#include "orbsvcs/Sched/Strategy_Scheduler.h" +#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h" #else -#include "orbsvcs/Sched/Scheduler_Generic.h" +#include "orbsvcs/orbsvcs/Sched/Scheduler_Generic.h" #endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */ class TAO_RTSched_Export ACE_Config_Scheduler diff --git a/TAO/orbsvcs/orbsvcs/Sched/Makefile.am b/TAO/orbsvcs/orbsvcs/Sched/Makefile.am new file mode 100644 index 00000000000..97213c6f2ab --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Sched/Makefile.am @@ -0,0 +1,47 @@ +##--------------------------------------------------------------------------- +## $Id$ +## +## Makefile for TAO's Scheduling Service library +## +##--------------------------------------------------------------------------- + +## +## Process this file with automake to create Makefile.in +## + +## The number in AUTOMAKE_OPTIONS is the minimum required version automake +## needed to process this file. +AUTOMAKE_OPTIONS = 1.4 + +INCLUDES = -I$(top_builddir) -I$(top_srcdir) + +lib_LTLIBRARIES = libTAO_Sched.la + +libTAO_Sched_la_LDADD = \ + $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la + +libTAO_Sched_la_SOURCES = \ + Config_Scheduler.cpp \ + DynSched.cpp \ + Reconfig_Scheduler.cpp \ + Reconfig_Sched_Utils.cpp \ + SchedEntry.cpp \ + Scheduler.cpp \ + Scheduler_Generic.cpp \ + Strategy_Scheduler.cpp + +noinst_HEADERS = \ + Config_Scheduler.h \ + DynSched.h \ + Reconfig_Scheduler.h \ + Reconfig_Sched_Utils.h \ + SchedEntry.h \ + Scheduler.h \ + Scheduler_Generic.h \ + Strategy_Scheduler.h + +## Clean up some additional files/directories possibly created during +## the configure script tests. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp index f5e75f3118e..9f2597df83f 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp @@ -22,7 +22,7 @@ #include "Reconfig_Sched_Utils.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h index 225fa09960e..b407bfaf1db 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h @@ -24,8 +24,8 @@ #include "ace/config-all.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/RtecSchedulerS.h" #include "sched_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h index 4e46f2f8a63..98b1e11baa8 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h @@ -23,8 +23,8 @@ #include "ace/Hash_Map_Manager.h" #include "ace/RB_Tree.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/RtecSchedulerS.h" #include "Reconfig_Sched_Utils.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index a6a16be05f2..debe5809f00 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -19,7 +19,7 @@ #define TAO_RECONFIG_SCHEDULER_T_C #include "Reconfig_Scheduler_T.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "ace/Auto_Ptr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h index 87cf62c1668..0e0a6e2074f 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h @@ -22,8 +22,8 @@ #include /**/ "ace/pre.h" #include "sched_export.h" -#include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "ace/Containers.h" ////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp index 9619eceb420..26d5d0cfba0 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp @@ -17,7 +17,7 @@ // ============================================================================ #include "ace/Sched_Params.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "Scheduler.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h index abb37fc6cee..5403d9013c6 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h @@ -33,8 +33,8 @@ #include "ace/SString.h" #include "ace/Unbounded_Set.h" -#include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "sched_export.h" class TAO_RTSched_Export ACE_Scheduler diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 9b169d85ff7..fef9bfd0158 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -4,13 +4,13 @@ #include "ace/Singleton.h" #include "ace/Null_Mutex.h" -#include "orbsvcs/Runtime_Scheduler.h" -#include "orbsvcs/Sched/Reconfig_Scheduler.h" -#include "orbsvcs/Sched/Reconfig_Sched_Utils.h" -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Runtime_Scheduler.h" +#include "orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h" +#include "orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Scheduler_Factory.i" +#include "orbsvcs/orbsvcs/Scheduler_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(orbsvcs, diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h index aa43e530553..2cd56b8f60b 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h @@ -24,9 +24,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/Sched/sched_export.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/Sched/sched_export.h" class TAO_Reconfig_Scheduler_Entry; struct TAO_RT_Info_Tuple; @@ -268,7 +268,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/Scheduler_Factory.i" +#include "orbsvcs/orbsvcs/Scheduler_Factory.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp index c21018bf426..5ae71bb106e 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp @@ -2,10 +2,10 @@ #include "ace/OS.h" -#include "orbsvcs/Scheduler_Utilities.h" +#include "orbsvcs/orbsvcs/Scheduler_Utilities.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Scheduler_Utilities.i" +#include "orbsvcs/orbsvcs/Scheduler_Utilities.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (orbsvcs, diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h index beda9ed5551..745247b2ed1 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h @@ -18,13 +18,13 @@ #define ACE_SCHEDULER_UTILITIES_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Sched/sched_export.h" +#include "orbsvcs/orbsvcs/Sched/sched_export.h" class TAO_RTSched_Export ACE_RT_Info : public RtecScheduler::RT_Info { @@ -61,7 +61,7 @@ public: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/Scheduler_Utilities.i" +#include "orbsvcs/orbsvcs/Scheduler_Utilities.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc index 257d9b1da26..c329d000bee 100644 --- a/TAO/orbsvcs/orbsvcs/Security.mpc +++ b/TAO/orbsvcs/orbsvcs/Security.mpc @@ -1,9 +1,10 @@ // -*- MPC -*- // $Id$ -project(Security) : orbsvcslib, corba_messaging, core, portableserver, interceptors, valuetype { +project(Security) : orbsvcslib, corba_messaging, core, portableserver { + requires += interceptors sharedname = TAO_Security - idlflags += -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h + idlflags += -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h dynamicflags = TAO_SECURITY_BUILD_DLL tagchecks += Security @@ -32,7 +33,4 @@ project(Security) : orbsvcslib, corba_messaging, core, portableserver, intercept Security } } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp index c600d1c71c9..8ae4f3bef13 100644 --- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp @@ -1,7 +1,7 @@ // $Id$ #include "CSI_Utils.h" -#include "orbsvcs/CSIC.h" +#include "orbsvcs/orbsvcs/CSIC.h" #include "tao/CDR.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h index eeb4bc7ddc9..7818fa3504f 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/orbsvcs/SecurityLevel2C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h index a349ef444a1..6cf09884257 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/orbsvcs/SecurityLevel2C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h index 3be591bcd38..946ec411ae2 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h @@ -15,13 +15,13 @@ #define TAO_SL3_CONTEXT_ESTABLISHMENT_POLICY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Security/security_export.h" +#include "orbsvcs/orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h index 6e593d6345d..9c77db90c02 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h @@ -16,15 +16,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Security/security_export.h" +#include "orbsvcs/orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Security/SL3_CredentialsCurator.h" +#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h" -#include "orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/orbsvcs/SecurityLevel3C.h" namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index 211d93e534f..8fbca77cd78 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -284,9 +284,6 @@ TAO::SL3::CredentialsCurator::_tao_add_own_credentials ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class TAO_Pseudo_Var_T<TAO::SL3::CredentialsCurator>; -template class TAO_Pseudo_Out_T<TAO::SL3::CredentialsCurator, TAO::SL3::CredentialsCurator_var>; - template class ACE_Map_Entry<const char *, TAO::SL3::CredentialsAcquirerFactory *>; template class ACE_Map_Iterator_Base<const char *, TAO::SL3::CredentialsAcquirerFactory *, ACE_Null_Mutex>; template class ACE_Map_Iterator<const char *, TAO::SL3::CredentialsAcquirerFactory *, ACE_Null_Mutex>; @@ -301,9 +298,6 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, SecurityLevel3::Ow #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Pseudo_Var_T<TAO::SL3::CredentialsCurator> -#pragma instantiate TAO_Pseudo_Out_T<TAO::SL3::CredentialsCurator, TAO::SL3::CredentialsCurator_var> - #pragma instantiate ACE_Map_Entry<const char *, TAO::SL3::CredentialsAcquirerFactory *> #pragma instantiate ACE_Map_Iterator_Base<const char *, TAO::SL3::CredentialsAcquirerFactory *, ACE_Null_Mutex> #pragma instantiate ACE_Map_Iterator<const char *, TAO::SL3::CredentialsAcquirerFactory *, ACE_Null_Mutex> diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h index 712588d7548..b6b95a2c21a 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h @@ -15,13 +15,13 @@ #define TAO_SL3_CREDENTIALS_CURATOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/Security/security_export.h" +#include "orbsvcs/orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h index b2f7d901b26..d35f2d51b0c 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h @@ -16,13 +16,13 @@ #define TAO_SL3_OBJECT_CREDENTIALS_POLICY_H #include /**/ "ace/pre.h" -#include "orbsvcs/Security/security_export.h" +#include "orbsvcs/orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h index 2cc6f6650f1..9c915f90d73 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Security/security_export.h" +#include "orbsvcs/orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,7 +24,7 @@ #include "SL3_SecurityCurrent_Impl.h" -#include "orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h index 5b0b97162ad..fcaaa0f629c 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h @@ -22,7 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "security_export.h" -#include "orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/orbsvcs/SecurityLevel3C.h" namespace TAO { diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h index 61b615e9cbb..a7efd8cb1a1 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h @@ -15,13 +15,13 @@ #define TAO_SL3_SECURITY_MANAGER_H #include /**/ "ace/pre.h" -#include "orbsvcs/Security/security_export.h" +#include "orbsvcs/orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index 673a5a2c952..c1be7b22e78 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/orbsvcs/SecurityLevel2C.h" #include "tao/ORB_Core.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h index a297564e3fd..7ffe96e6d1b 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -22,7 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "security_export.h" -#include "orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/orbsvcs/SecurityLevel2C.h" namespace TAO { diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index 673c4debebc..df9b15396a6 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -12,7 +12,7 @@ ACE_RCSID (Security, #include "SL3_CredentialsCurator.h" #include "SL3_SecurityManager.h" -#include "orbsvcs/SecurityC.h" +#include "orbsvcs/orbsvcs/SecurityC.h" #include "tao/ORBInitInfo.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 87f0d172965..be257f8089c 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -12,8 +12,8 @@ ACE_RCSID (Security, #include "SL3_ContextEstablishmentPolicy.h" #include "SL3_ObjectCredentialsPolicy.h" -#include "orbsvcs/SecurityLevel2C.h" -#include "orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/orbsvcs/SecurityLevel3C.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl index 4f165fde1ed..38534a3432e 100644 --- a/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl +++ b/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl @@ -6,7 +6,7 @@ #ifndef _SECURITY_LEVEL_1_IDL_ #define _SECURITY_LEVEL_1_IDL_ -#include <orbsvcs/Security.idl> +#include <orbsvcs/orbsvcs/Security.idl> #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl index 4826c449ed4..ca3cfaa0d08 100644 --- a/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl +++ b/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl @@ -6,7 +6,7 @@ #ifndef _SECURITY_LEVEL_2_IDL_ #define _SECURITY_LEVEL_2_IDL_ -#include <orbsvcs/SecurityLevel1.idl> +#include <orbsvcs/orbsvcs/SecurityLevel1.idl> #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl index 58a1162f82e..f348c1cc19a 100644 --- a/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl +++ b/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl @@ -19,8 +19,8 @@ #ifndef _SecurityLevel3_ #define _SecurityLevel3_ -#include "tao/Policy.pidl" -#include "tao/TimeBase.pidl" +#include <tao/Policy.pidl> +#include <tao/TimeBase.pidl> #pragma prefix "adiron.com" diff --git a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl index c7beeefd060..29cc213313d 100644 --- a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl +++ b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl @@ -5,7 +5,7 @@ #ifndef _SECURITY_REPLACEABLE_IDL_ #define _SECURITY_REPLACEABLE_IDL_ -#include "orbsvcs/SecurityLevel2.idl" +#include "orbsvcs/orbsvcs/SecurityLevel2.idl" #include "tao/IOP.pidl" #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc index 29887c21e45..cec18dfb8d4 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc @@ -3,7 +3,7 @@ project(Svc_Utils) : orbsvcslib, core, portableserver { sharedname = TAO_Svc_Utils - idlflags += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h + idlflags += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h dynamicflags = TAO_SVC_UTILS_BUILD_DLL IDL_Files { @@ -16,11 +16,7 @@ project(Svc_Utils) : orbsvcslib, core, portableserver { TimeBaseS.cpp RtecBaseC.cpp RtecBaseS.cpp - Shutdown_Utilities.cpp Time_Utilities.cpp IOR_Multicast.cpp } - - Template_Files { - } } diff --git a/TAO/orbsvcs/orbsvcs/Time/Makefile.am b/TAO/orbsvcs/orbsvcs/Time/Makefile.am new file mode 100644 index 00000000000..7b1f4668c1a --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Time/Makefile.am @@ -0,0 +1,42 @@ +##--------------------------------------------------------------------------- +## $Id$ +## +## Makefile for TAO's Time Service library +## +##--------------------------------------------------------------------------- + +## +## Process this file with automake to create Makefile.in +## + +## The number in AUTOMAKE_OPTIONS is the minimum required version automake +## needed to process this file. +AUTOMAKE_OPTIONS = 1.4 + +INCLUDES = -I$(top_builddir) -I$(top_srcdir) + +lib_LTLIBRARIES = libTAO_Time.la + +libTAO_Time_la_LDADD = \ + $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la + +libTAO_Time_la_SOURCES = \ + TAO_TIO.cpp \ + TAO_Time_Service_Clerk.cpp \ + TAO_Time_Service_Server.cpp \ + TAO_UTO.cpp \ + Timer_Helper.cpp + +noinst_HEADERS = \ + TAO_TIO.h \ + TAO_Time_Service_Clerk.h \ + TAO_Time_Service_Server.h \ + TAO_UTO.h \ + Timer_Helper.h + +## Clean up some additional files/directories possibly created during +## the configure script tests. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations + diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h index eef1f946440..3e2146b3b4f 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/TimeServiceS.h" +#include "orbsvcs/orbsvcs/TimeServiceS.h" #include "TAO_UTO.h" #include "time_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h index 41357544e52..4a5da1e566d 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h @@ -19,8 +19,9 @@ #include /**/ "ace/pre.h" #include "ace/Reactor.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/TimeServiceS.h" +#include "orbsvcs/orbsvcs/TimeServiceS.h" #include "Timer_Helper.h" #include "time_export.h" @@ -92,6 +93,10 @@ public: /// Return the globally synchronized time. virtual CORBA::ULongLong get_time (void); + /// This method is called by the driver program to set the Naming + /// Server instance. + void name_server (TAO_Naming_Server &server); + /// Returns the time displacement factor. CORBA::Short time_displacement_factor (void); diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h index f83b3cb5701..f7436e726a6 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h @@ -18,7 +18,7 @@ #define TAO_TIME_SERVICE_SERVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/TimeServiceS.h" +#include "orbsvcs/orbsvcs/TimeServiceS.h" #include "time_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h index b705d2244d8..9614194039a 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h @@ -18,7 +18,7 @@ #define TAO_UTO_H #include /**/ "ace/pre.h" -#include "orbsvcs/TimeServiceS.h" +#include "orbsvcs/orbsvcs/TimeServiceS.h" #include "time_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h index 5e89f43785d..b38dd4eae8b 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h @@ -27,7 +27,7 @@ #include "ace/Containers.h" #include "time_export.h" -#include "orbsvcs/TimeServiceS.h" +#include "orbsvcs/orbsvcs/TimeServiceS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp index 0018ea15cf2..8525b8d0d87 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #if !defined (__ACE_INLINE__) # include "orbsvcs/orbsvcs/Time_Utilities.i" diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h index 86759d4ae66..dd2f5f01793 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h @@ -18,8 +18,8 @@ #define ORBSVCS_TIME_UTILITIES_H #include /**/ "ace/pre.h" -#include "orbsvcs/TimeBaseC.h" -#include "orbsvcs/svc_utils_export.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/svc_utils_export.h" #include "ace/OS_NS_time.h" class TAO_Svc_Utils_Export ORBSVCS_Time @@ -69,7 +69,7 @@ public: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/Time_Utilities.i" +#include "orbsvcs/orbsvcs/Time_Utilities.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.i b/TAO/orbsvcs/orbsvcs/Time_Utilities.i index 280f9fa6121..7d3a4c5a10b 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.i +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.i @@ -1,10 +1,5 @@ -// -*- C++ -*- -// // $Id$ -#include "ace/Time_Value.h" - - ACE_INLINE TimeBase::TimeT ORBSVCS_Time::zero () { diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index b3e7e3ec208..0a5d53706ef 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -19,8 +19,8 @@ #include "Constraint_Visitors.h" #include "Interpreter.h" -#include "orbsvcs/CosTradingS.h" -#include "orbsvcs/CosTradingReposS.h" +#include "orbsvcs/orbsvcs/CosTradingS.h" +#include "orbsvcs/orbsvcs/CosTradingReposS.h" class TAO_Constraint_Evaluator; class TAO_Constraint_Validator; @@ -41,7 +41,7 @@ class TAO_Constraint_Validator; * EvaluationVisitor, which will evaluate the tree and decide * whether the offer meets the constraints. */ -class TAO_Trading_Serv_Export TAO_Constraint_Interpreter : public TAO_Interpreter +class TAO_Trading_Export TAO_Constraint_Interpreter : public TAO_Interpreter { public: // = Initialization and termination methods. @@ -88,7 +88,7 @@ public: * the offers, it will extract the offers in order using the * remove_offer method. */ -class TAO_Trading_Serv_Export TAO_Preference_Interpreter : public TAO_Interpreter +class TAO_Trading_Export TAO_Preference_Interpreter : public TAO_Interpreter { public: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h index dbc51ad0294..02fbfcb48c2 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h @@ -19,7 +19,7 @@ #include "tao/Basic_Types.h" -#include "orbsvcs/Trader/trading_serv_export.h" +#include "orbsvcs/orbsvcs/Trader/trading_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -54,7 +54,7 @@ namespace CORBA * subclass dispatches the method on an TAO_Constraint_Visitor * correlating to its type. */ -class TAO_Trading_Serv_Export TAO_Constraint +class TAO_Trading_Export TAO_Constraint { public: @@ -76,7 +76,7 @@ public: * * @brief A node that represents an operation with no operands. */ -class TAO_Trading_Serv_Export TAO_Noop_Constraint : public TAO_Constraint +class TAO_Trading_Export TAO_Noop_Constraint : public TAO_Constraint { public: @@ -99,7 +99,7 @@ private: * @brief TAO_Binary_Constraint represents an operation with left * and right operands. */ -class TAO_Trading_Serv_Export TAO_Binary_Constraint : public TAO_Constraint +class TAO_Trading_Export TAO_Binary_Constraint : public TAO_Constraint { public: @@ -158,7 +158,7 @@ private: * @brief TAO_Unary_Constraint represents an operation with only * one operand. */ -class TAO_Trading_Serv_Export TAO_Unary_Constraint : public TAO_Constraint +class TAO_Trading_Export TAO_Unary_Constraint : public TAO_Constraint { public: @@ -192,7 +192,7 @@ private: * @brief TAO_Property_Constraint represents a property whose * value is determined by the offer being evaluated. */ -class TAO_Trading_Serv_Export TAO_Property_Constraint : public TAO_Constraint +class TAO_Trading_Export TAO_Property_Constraint : public TAO_Constraint { public: @@ -223,7 +223,7 @@ private: * @brief TAO_Literal_Constraint represents a literal occuring in * the constraint expression tree. */ -class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint +class TAO_Trading_Export TAO_Literal_Constraint : public TAO_Constraint { public: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h index fd204d64153..0484d4330b5 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h @@ -15,8 +15,8 @@ #define TAO_CONSTRAINT_VISITOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Interpreter_Utils.h" -#include "orbsvcs/Trader/trading_serv_export.h" +#include "orbsvcs/orbsvcs/Trader/Interpreter_Utils.h" +#include "orbsvcs/orbsvcs/Trader/trading_export.h" #include "ace/Containers.h" class TAO_DynSequence_i; @@ -45,7 +45,7 @@ class TAO_Noop_Constraint; * method to deal with each possible type of node in an * expression tree; one for each operator in the grammar. */ -class TAO_Trading_Serv_Export TAO_Constraint_Visitor +class TAO_Trading_Export TAO_Constraint_Visitor { public: @@ -85,7 +85,7 @@ public: virtual int visit_property (TAO_Property_Constraint* literal) = 0; }; -#include "orbsvcs/Trader/Constraint_Nodes.h" +#include "orbsvcs/orbsvcs/Trader/Constraint_Nodes.h" /** * @class TAO_Constraint_Validator @@ -107,7 +107,7 @@ public: * at which point we can back out of the traversal and indicate * failure. */ -class TAO_Trading_Serv_Export TAO_Constraint_Validator : public TAO_Constraint_Visitor +class TAO_Trading_Export TAO_Constraint_Validator : public TAO_Constraint_Visitor { public: /// Constructor. @@ -217,7 +217,7 @@ private: * evaluation time errors are a divide by a property whose value * is zero and undefined properties. */ -class TAO_Trading_Serv_Export TAO_Constraint_Evaluator : public TAO_Constraint_Visitor +class TAO_Trading_Export TAO_Constraint_Evaluator : public TAO_Constraint_Visitor { public: @@ -306,7 +306,7 @@ public: private: - class TAO_Trading_Serv_Export Operand_Queue : + class TAO_Trading_Export Operand_Queue : public ACE_Unbounded_Queue <TAO_Literal_Constraint> // = TITLE // A queue adapter with methods to setting and getting operands diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h index 4575bc96e89..b667227be47 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h @@ -17,7 +17,7 @@ #include "Constraint_Nodes.h" #include "Constraint_Visitors.h" -#include "orbsvcs/Trader/trading_serv_export.h" +#include "orbsvcs/orbsvcs/Trader/trading_export.h" class TAO_Constraint_Evaluator; class TAO_Constraint_Validator; @@ -29,7 +29,7 @@ class TAO_Constraint_Validator; * build tree method invokes the yacc parser to parse a constraint * or preference string. */ -class TAO_Trading_Serv_Export TAO_Interpreter +class TAO_Trading_Export TAO_Interpreter { protected: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h index fccf6b4491b..7a8f4dcefc6 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h @@ -20,13 +20,12 @@ #include "tao/Typecode.h" #include "tao/CORBA_String.h" -#include "tao/SystemException.h" -#include "orbsvcs/Trader/trading_serv_export.h" +#include "orbsvcs/orbsvcs/Trader/trading_export.h" // = Classes to deal with the ACE_Hash_Map_Manager. -class TAO_Trading_Serv_Export TAO_String_Hash_Key : public CORBA::String_var +class TAO_Trading_Export TAO_String_Hash_Key : public CORBA::String_var { // = TITLE // Key for the Hash Table. The EXT_ID of the diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp index f621f592ea9..d907b2c4850 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp @@ -3,8 +3,8 @@ #ifndef TAO_INTERPRETER_UTILS_CPP #define TAO_INTERPRETER_UTILS_CPP -#include "orbsvcs/Trader/Interpreter_Utils_T.h" -#include "orbsvcs/Trader/Constraint_Visitors.h" +#include "orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h" +#include "orbsvcs/orbsvcs/Trader/Constraint_Visitors.h" #include "tao/DynamicAny/DynSequence_i.h" template <class OPERAND_TYPE> CORBA::Boolean diff --git a/TAO/orbsvcs/orbsvcs/Trader/Makefile.am b/TAO/orbsvcs/orbsvcs/Trader/Makefile.am new file mode 100644 index 00000000000..486744579d7 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Trader/Makefile.am @@ -0,0 +1,57 @@ +##--------------------------------------------------------------------------- +## $Id$ +## +## Makefile for TAO's Trading Service library +## +##--------------------------------------------------------------------------- + +## +## Process this file with automake to create Makefile.in +## + +## The number in AUTOMAKE_OPTIONS is the minimum required version automake +## needed to process this file. +AUTOMAKE_OPTIONS = 1.4 + +INCLUDES = -I$(top_builddir) -I$(top_srcdir) + +lib_LTLIBRARIES = libTAO_Trader.la + +libTAO_Trader_la_LDADD = \ + $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la + +libTAO_Trader_la_SOURCES = \ + Constraint_Interpreter.cpp \ + Constraint_Nodes.cpp \ + Constraint_Visitors.cpp \ + Constraint_l.cpp \ + Constraint_y.cpp \ + Offer_Database.cpp \ + Offer_Iterators.cpp \ + Offer_Iterators_T.cpp \ + Service_Type_Repository.cpp \ + Trader.cpp \ + Trader_Interfaces.cpp \ + Trader_T.cpp \ + Trader_Utils.cpp + +noinst_HEADERS = \ + Constraint_Interpreter.h \ + Constraint_Nodes.h \ + Constraint_Tokens.h \ + Constraint_Visitors.h \ + Offer_Database.h \ + Offer_Iterators.h \ + Offer_Iterators_T.h \ + Service_Type_Repository.h \ + Trader.h \ + Trader_Interfaces.h \ + Trader_T.h \ + Trader_Utils.h + +## Clean up some additional files/directories possibly created during +## the configure script tests. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations + diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index b65b50bb49b..88a868e027d 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -26,7 +26,7 @@ * @brief This class implements CosTradingRepos::ServiceTypeRepository * IDL interface. */ -class TAO_Trading_Serv_Export TAO_Service_Type_Repository : public POA_CosTradingRepos::ServiceTypeRepository +class TAO_Trading_Export TAO_Service_Type_Repository : public POA_CosTradingRepos::ServiceTypeRepository { public: /** diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index 1dabb8587b5..f2d907306df 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -25,10 +25,10 @@ #include "ace/Containers.h" -#include "orbsvcs/CosTradingS.h" -#include "orbsvcs/CosTradingReposS.h" -#include "orbsvcs/CosTradingDynamicS.h" -#include "orbsvcs/Trader/trading_serv_export.h" +#include "orbsvcs/orbsvcs/CosTradingS.h" +#include "orbsvcs/orbsvcs/CosTradingReposS.h" +#include "orbsvcs/orbsvcs/CosTradingDynamicS.h" +#include "orbsvcs/orbsvcs/Trader/trading_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -50,7 +50,7 @@ class TAO_Trader_Base; * @brief Uses command line arguments to construct a trader instance with * the correct interface support, locking, and policy settings. */ -class TAO_Trading_Serv_Export TAO_Trader_Factory +class TAO_Trading_Export TAO_Trader_Factory { public: @@ -141,7 +141,7 @@ public: * Contains a reference to the trader from which it is * used so it can use trader's lock. */ -class TAO_Trading_Serv_Export TAO_Support_Attributes_i +class TAO_Trading_Export TAO_Support_Attributes_i { public: // = Initialization and termination methods. @@ -193,7 +193,7 @@ private: * Contains a reference to the trader from which it is * used so it can use trader's lock. */ -class TAO_Trading_Serv_Export TAO_Link_Attributes_i +class TAO_Trading_Export TAO_Link_Attributes_i { public: // = Initialization and termination methods. @@ -224,7 +224,7 @@ private: * Contains a reference to the trader from which it is * used so it can use trader's lock. */ -class TAO_Trading_Serv_Export TAO_Import_Attributes_i +class TAO_Trading_Export TAO_Import_Attributes_i { public: // = Initialization and termination methods. @@ -322,7 +322,7 @@ private: * IDL methods in CosTrading::Trader_Components would need * add a _duplicate call for each get method). */ -class TAO_Trading_Serv_Export TAO_Trading_Components_i +class TAO_Trading_Export TAO_Trading_Components_i { public: @@ -396,7 +396,7 @@ private: * want all these classes to be templatized. TAO_Trader_Base class solves * this problem. */ -class TAO_Trading_Serv_Export TAO_Trader_Base : public TAO_Lockable +class TAO_Trading_Export TAO_Trader_Base : public TAO_Lockable { public: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h index e5740b3dc86..ff646edb63f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h @@ -17,9 +17,9 @@ #include "Constraint_Visitors.h" #include "Trader.h" #include "Trader_Utils.h" -#include "orbsvcs/CosTradingC.h" +#include "orbsvcs/orbsvcs/CosTradingC.h" -class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator +class TAO_Trading_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator { public: /** @@ -38,7 +38,7 @@ class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator : public TAO_Const }; -class TAO_Trading_Serv_Export TAO_Trader_Constraint_Evaluator : public TAO_Constraint_Evaluator +class TAO_Trading_Export TAO_Trader_Constraint_Evaluator : public TAO_Constraint_Evaluator { public: /// Constructor. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index d77b3153669..bd99c2682d8 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -39,7 +39,7 @@ * CORBA sequences, but requires that the client know the layout of * properties ahead of time. */ -class TAO_Trading_Serv_Export TAO_Property_Evaluator +class TAO_Trading_Export TAO_Property_Evaluator { public: @@ -123,7 +123,7 @@ private: * names to integer indicies, upon which lookups are guaranteed to * be O(lg n). */ -class TAO_Trading_Serv_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator +class TAO_Trading_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator { public: @@ -182,7 +182,7 @@ private: * @brief Little helper class that you can extend to have your dynamic * property handler construct CosTradingDynamic::DynamicProp structs. */ -class TAO_Trading_Serv_Export TAO_Dynamic_Property +class TAO_Trading_Export TAO_Dynamic_Property : public virtual POA_CosTradingDynamic::DynamicPropEval, public virtual PortableServer::RefCountServantBase { @@ -496,7 +496,7 @@ private: * interface that helps them build a policy sequence without violating * syntax rules and having to mess with typecodes. */ -class TAO_Trading_Serv_Export TAO_Policy_Creator +class TAO_Trading_Export TAO_Policy_Creator { public: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index 140a025fbe7..4ccc57f7c0e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -486,7 +486,7 @@ TAO_Trading_Loader::parse_args (int &argc, ACE_TCHAR *argv []) return 0; } -ACE_FACTORY_DEFINE (TAO_Trading_Serv, TAO_Trading_Loader) +ACE_FACTORY_DEFINE (TAO_Trading, TAO_Trading_Loader) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index ce679eada06..fb86bce35f1 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -24,11 +24,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/IOR_Multicast.h" -#include "orbsvcs/Trader/Trader.h" -#include "orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/orbsvcs/IOR_Multicast.h" +#include "orbsvcs/orbsvcs/Trader/Trader.h" +#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" -class TAO_Trading_Serv_Export TAO_Trading_Loader : public TAO_Object_Loader +class TAO_Trading_Export TAO_Trading_Loader : public TAO_Object_Loader { public: @@ -106,6 +106,6 @@ public: }; -ACE_FACTORY_DECLARE (TAO_Trading_Serv, TAO_Trading_Loader) +ACE_FACTORY_DECLARE (TAO_Trading, TAO_Trading_Loader) #endif /* TAO_TRADING_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb index 30b0038758d..dad3c6900fd 100644 --- a/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb +++ b/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb @@ -1,28 +1,30 @@ // -*- MPC -*- // $Id$ -feature(ec_typed_events) { - macros += TAO_HAS_TYPED_EVENT_CHANNEL - idlflags += -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h +feature(ec_typed_events): taoidldefaults { + macros += TAO_HAS_TYPED_EVENT_CHANNEL + libs += TAO_IFR_Client TAO_DynamicInterface + after += IFR_Client DynamicInterface + idlflags += -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h IDL_Files { CosTypedEventComm.idl CosTypedEventChannelAdmin.idl } - Source_Files { - CosTypedEventCommC.cpp - CosTypedEventChannelAdminC.cpp - } - - Header_Files { - CosTypedEventCommC.h - CosTypedEventChannelAdminC.h - } - - Inline_Files { - CosTypedEventCommC.inl - CosTypedEventChannelAdminC.inl + Source_Files(ORBSVCS_COMPONENTS) { + CosEvent { + CosTypedEventCommC.cpp + CosTypedEventChannelAdminC.cpp + CosTypedEventCommS.cpp + CosTypedEventChannelAdminS.cpp + CosEvent/CEC_TypedEvent.cpp + CosEvent/CEC_TypedEventChannel.cpp + CosEvent/CEC_TypedProxyPushConsumer.cpp + CosEvent/CEC_TypedConsumerAdmin.cpp + CosEvent/CEC_TypedSupplierAdmin.cpp + CosEvent/CEC_DynamicImplementation.cpp + } } } diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp index 68953a71771..e043721e26d 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp @@ -1,8 +1,8 @@ #include "ORBInitializer.h" #include "ServerRequestInterceptor.h" -#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h" -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h index d089c75ee9e..773e034dace 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LoadBalancing/LB_LoadAlert.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h index 3e2bd11f9b2..9eb4bbd955f 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc index 079da1f50f9..7c40937df34 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc @@ -1,8 +1,9 @@ // $Id$ -project: orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project: orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { driver.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc index 8071ce1b8d5..37968d5d018 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc @@ -1,18 +1,20 @@ // $Id$ -project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { server.cpp } } -project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*client): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { client.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc index 21b9f66db74..b30da066e4c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc @@ -1,8 +1,9 @@ // $Id$ -project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { server.cpp @@ -10,10 +11,11 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { } } -project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*client): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { TestC.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc index b0f8e782677..888b449e615 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc @@ -1,8 +1,9 @@ // $Id$ -project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { server.cpp @@ -11,10 +12,11 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { } } -project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*client): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { client.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc index 431a4fbd726..b19cf565d20 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc @@ -1,18 +1,20 @@ // $Id$ -project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { server.cpp } } -project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { client.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp index b07d2c9add2..c61cd9640f8 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp @@ -9,8 +9,8 @@ #include "ORB_Task.h" #include "ORB_Task_Activator.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" #include "tao/PortableServer/PortableServer.h" #include "tao/RTPortableServer/RTPortableServer.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc index b337568bab2..abef2e1dff7 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc @@ -1,18 +1,20 @@ // $Id$ -project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*server): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { server.cpp } } -project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*client): orbsvcsexe, rtcorbaevent, strategies { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs + avoids += minimum_corba Source_Files { client.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp index 5fc7489897e..63ff884f656 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp @@ -8,7 +8,7 @@ #include "Consumer.h" #include "Implicit_Deactivator.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (TAO_PERF_RTEC, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h index 9a982381130..fb105da7511 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h @@ -9,8 +9,8 @@ #define TAO_PERF_RTEC_CONSUMER_H #include "rtec_perf_export.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Sample_History.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp index b35d809551c..86f846853d5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp @@ -11,7 +11,7 @@ #include "Shutdown.h" #include "Auto_Disconnect.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "ace/High_Res_Timer.h" #include "ace/Sample_History.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h index 0c622a996a8..1c160b0370d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h @@ -10,7 +10,7 @@ #define TAO_PERF_RTEC_EC_DESTROYER_H #include "rtec_perf_export.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp index 2c3d1f8084e..cb7693306f9 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp @@ -8,7 +8,7 @@ #include "Loopback_Consumer.h" #include "Implicit_Deactivator.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" ACE_RCSID (PERF_RTEC, Loopback_Consumer, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h index b3e05ea1c10..ba25bc40a16 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h @@ -10,8 +10,8 @@ #include "Loopback_Supplier.h" #include "tao/Utils/Servant_Var.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h index 084c2bd1341..75bfd1cb88f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h @@ -10,8 +10,8 @@ #define TAO_RTEC_LOOPBACK_SUPPLIER_H #include "rtec_perf_export.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp index 74741e0f8be..906dacdfdcd 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp @@ -15,8 +15,8 @@ #include "Auto_Disconnect.h" #include "Loopback.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h" ACE_RCSID (TAO_RTEC_Perf, Peer_Base, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h index 3733441998b..aaed29be88d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h @@ -11,7 +11,7 @@ #define TAO_RTEC_PERF_PEER_BASE_H #include "Federated_TestS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp index 408b52b3557..f5516c30508 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp @@ -9,9 +9,9 @@ #include "RTEC_Initializer.h" #include "RTCORBA_Setup.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/EC_RTCORBA_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc index 2f7c48e06c2..35ee463a899 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc @@ -1,5 +1,6 @@ // $Id$ -project(RTEC_Perf): strategies, messaging, orbsvcslib, rtcorbaevent, rtevent, naming, svc_utils, iortable, rtportableserver, rtcorba, minimum_corba { +project(RTEC_Perf): strategies, messaging, orbsvcslib, rtcorbaevent, rtevent, naming, svc_utils, iortable, rtportableserver, rtcorba { + avoids += minimum_corba sharedname = TAO_RTEC_Perf idlflags += -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h dynamicflags += TAO_RTEC_PERF_BUILD_DLL diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp index 4e4260a89f9..096d2f09cbd 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp @@ -8,7 +8,7 @@ #include "Send_Task.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "ace/Barrier.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h index 6a04b5f7049..cc3878a8be1 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h @@ -10,8 +10,8 @@ #define TAO_PERF_RTEC_SUPPLIER_H #include "rtec_perf_export.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h index 8045519e6bc..3c67f88ee21 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h @@ -18,9 +18,9 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" #include "tao/PortableServer/PortableServer.h" class Endpoint_Addresses diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp index de4512bf7da..ec98f79d6bd 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp @@ -2,7 +2,7 @@ #include "distributer.h" #include "ace/Get_Opt.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" typedef ACE_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER; diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h index 319f6287193..a2218860dff 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h @@ -19,9 +19,9 @@ // ============================================================================ #include "Connection_Manager.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Distributer_Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/input b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/input new file mode 100644 index 00000000000..b062e42bbaa --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/input @@ -0,0 +1,4000 @@ +Wed Apr 11 20:36:36 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * examples/Synch/proc_sema.cpp (main): Fixd an assigning string + literal to char* warning. + +Wed Apr 11 18:04:33 2001 Steve Huston <shuston@riverace.com> + + * include/makeinclude/rules.bin.GNU: Change the Visual Age C++ + incremental build command to use vacbld_r, the thread-enabled + variant of vacbld. + +Wed Apr 11 11:00:50 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ACE-INSTALL.html: Added a section illustrating how to build + ACE+TAO for RTEMS. Thanks to Joel Sherrill <joel@OARcorp.com> + for this build procedure. + +Wed Apr 11 11:38:37 2001 Steve Huston <shuston@riverace.com> + + * ace/IOStream.h: Reverted change from + Tue Apr 10 18:35:22 2001 Steve Huston <shuston@riverace.com> + and replaced it with a section that sets ACE_LACKS_ACE_IOSTREAM + if ACE_HAS_STANDARD_CPP_LIBRARY is set and ACE_USES_OLD_IOSTREAMS + is not. This restriction is noted and tracked in Bugzilla # 857. + + * ace/IOStream.cpp: + * tests/IOStream_Test.cpp: Reverted change from + Tue Apr 10 18:35:22 2001 Steve Huston <shuston@riverace.com> + +Wed Apr 11 09:44:32 2001 Chad Elliott <elliott_c@ociweb.com> + + * examples/Misc/test_trace.cpp: + + Fixed a strange compiler error with Tornado II. + My_Task::recursive was inline which caused an internal compiler + error. + +Wed Apr 11 08:04:21 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * include/makeinclude/platform_linux.GNU: By default, we build + ACE+TAO with exceptions enabled on Linux. Thanks to Craig + Rodrigues <crodrigu@bbn.com> for motivating this change. + + * ace/SString.i (operator+): Fixed an "inlined before use" warning. + Thanks to Bala for reporting this. + +Tue Apr 10 16:58:54 2001 Ossama Othman <ossama@uci.edu> + + * ace/OS.h (ACE_DEFAULT_FILE_PERMS, ACE_DEFAULT_DIR_PERMS): + + Changed the default values on UNIX from 0666 and 0777 to 0644 + and 0755, i.e. removed global write permissions. This addresses + some security issues. Now, only the owner has write permissions + by default. + +Tue Apr 10 18:35:22 2001 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_sunos5_sunc++.GNU: Added a new + build option, stdcpplib, which defaults to 1. If set to 1, + Sun Workshop 5 and Forte 6 compilers will use the standard + C++ library, including standard iostreams. Set to 0 to + use the old, classic iostreams. + + * include/makeinclude/platform_hpux_aCC.GNU: Added support for + the stdcpplib build option. It defaults to 1 if using aC++ + x.27, or 0 if not. Thanks very much to Istvan Buki <ibuki@fedex.com> + for these changes. + + * ace/config-aix-4.x.h: For Visual Age C++ 5, turn on + ACE_HAS_STANDARD_CPP_LIBRARY and + ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB. + + * ace/config-sunos5.5.h: For Sun Workshop 5 and Forte 6 compilers, + take the ACE_USES_OLD_IOSTREAMS setting from the platform_macros.GNU + file; don't set it here. + + * ace/config-hpux-11.00.h: + * ace/config-hpux-10.x-hpc++.h: If the stdcpplib=1 option was used, + then turn on ACE_HAS_STANDARD_CPP_LIB and + ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB. Else turn on + ACE_USES_OLD_IOSTREAMS. + + * ace/IOStream.{h cpp}: Only try to build this stuff if + ACE_LACKS_ACE_IOSTREAM is not defined and ACE_USES_OLD_IOSTREAMS + _is_ defined. The check on ACE_USES_OLD_IOSTREAMS can be removed + when ACE_IOStream gets ported to standard iostreams. + + * tests/IOStream_Test.cpp: Only try this if ACE_USES_OLD_IOSTREAMS + is defined. Remove this if/when ACE_IOStream is ported to new + iostreams. + +Tue Apr 10 17:51:25 2001 Pradeep Gore <pradeep@cs.wustl.edu> + + * bin/auto_run_tests.lst: + Added TAO/tests/OctetSeq/run_test1{2}.pl to auto testing. + +Tue Apr 10 16:33:42 2001 Joe Hoffert <joeh@cs.wustl.edu> + + * ace/CDR_Stream.i: + * ace/CDR_Stream.cpp: + Added sanity checks for sizes of strings and arrays. + +Tue Apr 10 15:14:52 2001 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_vxworks5.x_g++.GNU: + + Added missing else/endif from previous support addition. + +Tue Apr 10 11:48:51 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * include/makeinclude/platform_vxworks5.x_g++.GNU: Added support + for the M68k line of CPUs. Thanks to Albert Pariante + <albert@sw.bev.etn.com> for reporting this. + +Tue Apr 10 02:14:55 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * bin/PerlACE/Run_Test.pm (check_n_cleanup_files): Added a new + PerlACE function that checks for unwanted files and spits out a + warning before removing the file. It makes sure that we not + only clean up resource leaks but also notice their existence. + + * tests/run_test.pl (delete_temp_files): Used the new + <check_n_cleanup_files> to remove the temp files for + MEM_Stream_Test, if there are any. + +Tue Apr 10 1:44:02 2001 Yamuna Krishnamurthy <yamuna@ace.cs.wustl.edu> + + * examples/QOS/Change_Sender_TSpec/receiver.cpp: + * examples/QOS/Change_Sender_TSpec/receiver.dsp: + * examples/QOS/Change_Sender_TSpec/sender.cpp: + * examples/QOS/Change_Sender_TSpec/sender.dsp: + * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h: + * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp: + * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h: + * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp: + * examples/QOS/Change_Sender_TSpec/QoS_Util.h: + * examples/QOS/Change_Sender_TSpec/QoS_Util.cpp: + * examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h: + * examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp: + * examples/QOS/Change_Sender_TSpec/FlowSpec_Dbase.h: + * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h: + * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp: + * examples/QOS/Change_Sender_TSpec/README: + * examples/QOS/Change_Sender_TSpec/Makefile: + + Added a test to dynamically change the Sender flow spec in + order to continuously change the PATH messages. + + * examples/QOS/Change_Receiver_FlowSpec/receiver.cpp: + * examples/QOS/Change_Receiver_FlowSpec/receiver.dsp: + * examples/QOS/Change_Receiver_FlowSpec/sender.cpp: + * examples/QOS/Change_Receiver_FlowSpec/sender.dsp: + * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h: + * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp: + * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h: + * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp: + * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h: + * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp: + * examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h: + * examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp: + * examples/QOS/Change_Receiver_FlowSpec/FlowSpec_Dbase.h: + * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h: + * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp: + * examples/QOS/Change_Receiver_FlowSpec/README: + * examples/QOS/Change_Receiver_FlowSpec/Makefile: + + Added a test to dynamically change the Receiver flow spec in + order to continuously change the RESV messages. + + * examples/QOS/Simple/receiver.cpp: + * examples/QOS/Simple/receiver.dsp: + * examples/QOS/Simple/sender.cpp: + * examples/QOS/Simple/sender.dsp: + * examples/QOS/Simple/Sender_QoS_Event_Handler.h: + * examples/QOS/Simple/Sender_QoS_Event_Handler.cpp: + * examples/QOS/Simple/Receiver_QoS_Event_Handler.h: + * examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp: + * examples/QOS/Simple/QoS_Util.h: + * examples/QOS/Simple/QoS_Util.cpp: + * examples/QOS/Simple/QoS_Signal_Handler.h: + * examples/QOS/Simple/QoS_Signal_Handler.cpp: + * examples/QOS/Simple/FlowSpec_Dbase.h: + * examples/QOS/Simple/Fill_ACE_QoS.h: + * examples/QOS/Simple/Fill_ACE_QoS.cpp: + * examples/QOS/Simple/README: + * examples/QOS/Simple/Makefile: + + Moved the original QOS example to Simple. + + * examples/QOS/Makefile: + * examples/QOS/QOS.dsw: + + Updated the Makefile to compile the constituent tests. + +Mon Apr 9 18:48:02 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * include/makeinclude/Makefile.rtems: Zapped + + export RTEMS_MAKEFILE_PATH=/opt/rtems/sparc-rtems/erc32/ + + so that the environment variable is obtained from the users + environment. Thanks to Joel Sherrill <joel@OARcorp.com> for + this fix. + + * ace/Log_Msg.h: Only define the ACE_ASSERT macro if it's not + already defined. This make it easy for developers to override + this macro in their config.h file. Thanks to Nathalie D'Amours + <nathalie@stentor.com> for motivating this change. + +Mon Apr 9 15:36:04 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/High_Res_Timer.cpp: + Use the 'cpu MHz' line from /proc/cpuinfo in favor of the + 'bogomips' line, because the latter gives the wrong number on + multi-CPU boxes. + +Mon Apr 9 14:37:30 2001 Chad Elliott <elliott_c@ociweb.com> + + * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: + + Removed extraneous template instantiations. + +Mon Apr 09 09:19:37 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/SString.cpp: + Fixed Fuzz error + +Mon Apr 9 08:28:47 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/SString.{h,i,cpp}: Added improved support for ACE_WString: + . The magic number 32 has been changed to ACE_DEFAULT_GROWSIZE. + . ACE_WString only allocates memory when it is needed. + . The grow strategy can be modified by setting the ACE_GROW_LINEAR define. + the string does not double the memory then, but increases the memory by + ACE_DEFAULT_GROWSIZE. + Thanks to Eric Zuur <Eric.Zuur@meco.nl> for contributing these + enhancements. + + * ace/High_Res_Timer.cpp (get_cpuinfo): Added support for the Pentium + III and IV. Thanks to Stephane Pion + <PION_Stephane@stna.dgac.fr> for contributing this fix. + +Mon Apr 9 07:50:08 2001 Chad Elliott <elliott_c@ociweb.com> + + * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: + * examples/IPC_SAP/SOCK_SAP/Makefile: + Fixed a typo in the Makefile and added "CPP-inclient.h" include to + CPP-memclient.cpp. + +Mon Apr 9 07:42:29 2001 Chad Elliott <elliott_c@ociweb.com> + + * ace/Basic_Types.cpp: + Changed format flags from ios::fmtflags to unsigned long. + This typedef is not supported by all platforms. Thanks Carlos + <coryan@uci.edu> for suggesting this change. + +Mon Apr 09 08:08:11 2001 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Timer_Queue_T.h + Declared private copy constructor and assignment operator + for class ACE_Event_Handler_Handle_Timeout_Upcall + +Sun Apr 08 18:55:58 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/DLL_Test.cpp: + Use ACE::ldname() instead of keeping a local function to + decorate the name. + Use the "d" suffix only on MSVC debug builds. + + * tests/Makefile.bor: + * tests/DLL_Test.bor: + New Borland Makefile for the shared library in DLL_Test. Thanks + to Christopher Kohlhoff <chris@kohlhoff.com> for providing the + patches. + + * tests/run_test.pl: + Add ExeSubDir to the path, required in Borland builds to find + the shared libraries created locally. + +Sun Apr 8 13:12:54 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/SString.cpp: Reordered various constructor initializers so + G++ doesn't complain. Thanks to Bala for reporting this. + + * ace/SString.{h,i,cpp}: Added various optimizations to ACE_WString + so it will perform certain operations as efficiently as + ACE_CString. Thanks to Eric Zuur <Eric.Zuur@meco.nl> for + contributing these enhancements. + +Sun Apr 08 12:10:30 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: + * examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp: + * examples/IPC_SAP/SOCK_SAP/Makefile: Updated obsolete + shared-memory transport functions. + +Sun Apr 8 09:49:26 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * bin: Added a new shell script called "make-components" that enables + each ACE component to be built in a simple manner using the + following change from Arturo. + + * ace/Makefile: Generalized the libACE.a and libACE.$(SOEXT) targets + to simplify subsettings. Thanks to Arturo Montes + <mitosys@colomsat.net.co> for reporting this. + +Sat Apr 7 16:00:48 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * tests: Added a new rtems_init.c file. Thanks to Joel Sherrill + <joel@OARcorp.com> for contributing this port. + + * include/makeinclude: Added the new platform_rtems.x_g++.GNU file. + * ace: Added the new config-rtems.h file. + + * ace/OS.cpp: Added support for RTEMS, which is an open-source + real-time operating system that can be downloaded from + ftp://ftp.oarcorp.com/pub/rtems. Thanks to Joel Sherrill + <joel@OARcorp.com> for contributing this port. + + * ace/OS.cpp: The return type for ACE_OS::readv_emulation() + should have been ssize_t, not int, to be consistent with its + definition in the header file. Thanks to Joel Sherrill + <joel@OARcorp.com> for reporting this. + +Sat Apr 7 21:16:49 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Add the new Crash_On_Write and MT_Timeout tests to the nightly + builds. + +Fri Apr 6 21:02:05 2001 Carlos O'Ryan <coryan@uci.edu> + + * examples/Synch/proc_sema.cpp: + Add missing #include for "ace/Log_Msg.h", on platforms that + define ACE_TEMPLATES_REQUIRE_SOURCE this include is magically + obtained, but this is not the case for SunCC 4.2, and + True64/CXX. + +Fri Apr 06 16:22:24 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/SString.h (ACE_Tokenizer): Updated documentation and added + some examples. Thanks to Jody Hagins <jody@atdesk.com> for + providing the original example. + +Fri Apr 6 17:11:34 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * bin/auto_run_tests.lst: Added the Single_Read test to the + nightly build list. + +Fri Apr 6 14:45:52 2001 Chad Elliott <elliott_c@ociweb.com> + + * ace/Basic_Types.h: + * ace/Basic_Types.cpp: + Changed the as_string() method to avoid using floor() which + required math.h and ACE_CString which caused unnecessary coupling. + +Fri Apr 6 08:34:15 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/make_pretty.pl: + Do no give out warnings for the 'nocompatwarnings' option in + HP-UX. + +Fri Apr 6 08:23:02 2001 Chad Elliott <elliott_c@ociweb.com> + + * ace/Basic_Types.cpp: + * ace/Basic_Types.h: + * tests/Process_Strategy_Test.cpp: + * examples/Connection/misc/Connection_Handler.cpp: + Remove build warnings for platforms that don't support unsigned + long long types and have unsigned char's. + +Fri Apr 6 02:02:01 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/OS.h: + * ace/OS.i: The implementation for process semaphore on platforms + lacking named POSIX semaphores was broken. On these platforms, + semaphores are allocated in MMAP file so they should never be + deleted. Added a flag <new_sema_> to remember if a semaphore + can be deleted (USYNC_THREAD) or not (USYNC_PROCESS). + + * ace/config-sunos5.6.h: According to the man pages, SunOS started + supporting POSIX semaphores from 5.6. Defined ACE_HAS_POSIX_SEM + and ACE_LACKS_NAMED_POSIX_SEM. + +Thu Apr 5 11:23:05 2001 Carlos O'Ryan <coryan@uci.edu> + + * html/index.html: + Add link to the new QoS library documentation. + +Thu Apr 05 03:26:13 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * examples/Makefile: + * examples/Synch/Makefile: + * examples/Synch/README: + * examples/Synch/Synch.dsw: + * examples/Synch/proc_sema.cpp: + * examples/Synch/proc_sema.dsp: Added a new example to play with + process semaphores. + +Thu Apr 05 02:48:51 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_IO.cpp (write): My earlier change was causing the test + to crash. + + * ace/MEM_Stream.h: + * ace/MEM_Stream.i: + * ace/MEM_Stream.cpp: Added a new method to inform the stream to + clean up its resources when closing down. + + * tests/MEM_Stream_Test.cpp (handle_close): Handle_close should + only inform it's peer to destroy the mmap file instead of + removing the file itself. + +Wed Apr 4 16:21:13 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/auto_run_tests.lst: + + Added the ImplRepo tests. + +Wed Apr 4 12:13:52 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_IO.h: Declared ACE_INLINE_FOR_GNUC for + ACE_MT_MEM_IO::Simple_Queue's constructor to eliminate a bogus + warning reported by vxworks' gcc compiler. + +Wed Apr 04 07:47:48 2001 Craig Rodrigues <crodrigu@bbn.com> + + * etc/ace_qos.doxygen: + * bin/generate_doxygen.pl: + Generate doxygen documentation for ACE QoS API + +Tue Apr 03 19:55:26 2001 Steve Huston <shuston@riverace.com> + + * bin/auto_compile: Added a -make_type option - the argument to + the option is the suffix of Makefile to use. Example: + -make_type vac would use Makefile.vac instead of Makefile + when building. + + * bin/make_pretty.pl: Corrected tests for AIX errors/warnings. + + * ace/ace.icp: (new) Visual Age C++ 5 project file for libACE. + + * ace/ace.icc: (new) Visual Age C++ 5 configuration file for + libACE. Replaces ace-dll.icc. It will eventually have the + stuff added to make debug/optimize as well as subsets. + + * ace/ace_vacpp_options.icc: Visual Age C++ file for setting ACE + build options. + + * ace/Makefile.vac: Makefile to build libACE using the Visual + Age C++ 5 incremental compiler. It only has "all" and "realclean" + targets, and uses vacbld_r to do the build. + + * tests/tests.icp: Visual Age C++ 5 Project file for making all the + tests. + + * tests/Makefile.vac: Makefile to drive vacbld_r for Visual Age C++. + + * tests/Config_Test.icc: + * tests/Dirent_Test.icc: + * tests/Logging_Strategy_Test.icc: + * tests/MEM_Stream_Test.icc: + * tests/Message_Queue_Test_Ex.icc: + * tests/OS_Test.icc: + New files for building tests with Visual Age C++. + + * tests/libDLL_Test.icc: Changed to use up-to-date source file. + +Tue Apr 03 13:45:02 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_IO.cpp: Fixed mismatched ACE_TRACE messages. Thanks to + the all mighty fuzzmasterd for reporting this. + +Tue Apr 3 11:40:42 2001 Priyanka Gontla <pgontla@ece.uci.edu> + + * examples/IPC_SAP/SSL_SAP/dummy.pem: + * examples/IPC_SAP/SSL_SAP/key.pem: + The previous certificates expired. So, generated them + again. + +Tue Apr 03 09:30:10 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_IO.cpp (write): Fixed a compilation error for Borland + compiler. Thanks to Johnny Willensen for reporting this. + +Mon Apr 02 23:41:34 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_SAP.cpp: + * ace/MEM_SAP.h: + * ace/MEM_SAP.i: + Generalized the ACE_MEM_SAP class to allocate memory in the new + memory wrapper class ACE_MEM_SAP_Node. + + * ace/MEM_IO.cpp: + * ace/MEM_IO.h: + * ace/MEM_IO.i: + Separated the different signaling mechanisms into a different + class in ACE_MEM_IO so it can determine the "right" signaling + strategy allowed. Currently, we implement the Reactive strategy + (ACE_Reactive_MEM_IO) which uses sockets for signaling and + multithreaded strategy (ACE_MT_MEM_IO) which uses semaphores for + signaling. + + * ace/MEM_Stream.cpp: + Sending an empty buffer over to wake up the "other" end when we + are closing down. + + * ace/MEM_Acceptor.cpp: + * ace/MEM_Acceptor.h: + * ace/MEM_Acceptor.i: + * ace/MEM_Connector.cpp: + * ace/MEM_Connector.h: + * ace/MEM_Connector.i: Added facility to specify the "preferred" + signaling strategy so the acceptor and connector can negociate + and agree on the best signaling mechanism to use. + + * ace/MEM_Stream_Test.h: + * ace/MEM_Stream_Test.cpp: + Added the test for the new MT signaling MEM_Stream transfer. + This part of the test seems to be failing on system that depends + on SysV semaphores (because we need more semaphore than the + system can provide.) + +Mon Apr 2 15:17:13 2001 Chad Elliott <elliott_c@ociweb.com> + + * ace/config-chorus.h: + + Chorus 4.x supports unsigned long long's. + +Mon Apr 2 14:23:31 2001 Craig Rodrigues <crodrigu@bbn.com> + + * ace/Makefile: + only build QoS directory under UNIX if rapi is installed + * ace/QoS/README: + add installation instructions and GQOS/RAPI information + +Mon Apr 2 09:57:31 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/PerlACE/MSProject.pm: + + Made a change to the tao_idl depencency checking. + It was only checking for tao_idl and $(InputName) where + some places we use $(InputPath) instead. + + * ace/config-win32-msvc-5.h: + * ace/config-win32-msvc-6.h: + + Disabled the Inheritance by Dominance informational + warning that MSVC gives. We have cases of this all over + the place, and normally we just disable the warning on + a file by file basis, but now we just do a blanket disable. + +Mon Apr 2 08:45:24 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/nightlybuilds/builds.lst: + Renamed the Debian_Full_WU build, its most important feature is + not that it is at WashU nor that it enables most components. It + is the fact that interceptors are disabled on its configuration. + +Sun Apr 1 17:20:22 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/INET_Addr.h: + + Added /**/ around for the inclusion of inetLib.h, since some + MS compilers pick this up in dependency generation. + + * bin/PerlACE/MSProject.pm: + + Used \Q\E around the library names when matching, otherwise + the backslashes were interpreted as escaping, and weird + unicode errors popped up. + + * bin/pippen.pl: + + Pippen was being case sensitive, so tao.lib was different + than TAO.lib. Changes to store only lowercase. + +Sat Mar 31 10:16:01 2001 Carlos O'Ryan <coryan@uci.edu> + + * ACE-INSTALL.html: + Removed broken link, the web page does not exist anymore. Thanks + to John R. Ashmun <john.ashmun@esca.com> for pointing this out. + This fixes [BUGID:833] + +Fri Mar 30 14:08:18 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * performance-tests/TTCP/C/new-ttcp.cpp: + * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp: + Zapped the gettimeofday() method since it didn't seem to be + used. Also, #include "ace/Log_Msg.h". Thanks to Thomas Groth + <groth.th@nord-com.net> for reporting this. + + * ace/OS.h: Changed all the ACE_DEFAULT_* default ports of the + various services to start with 200xx rather than 100xx to avoid + conflicts on AIX, which apparently hijacks port 10002 for + various things. Thanks to David Sperry + <sperryd@res.raytheon.com> for reporting this. + +Sat Mar 31 02:06:09 2001 Christopher Kohlhoff <chris@kohlhoff.com> + + * ace/config-win32-borland.h: + * include/makeinclude/ace_flags.bor: + Fixed up use of inline functions in DEBUG build. + + * include/makeinclude/ace_flags.bor: + Added macros for the TAO_BiDirGIOP and TAO_TypeCodeFactory + libraries. + +Fri Mar 30 11:17:39 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/fuzz.pl: + Add a couple of TODO entries + + * html/index.html: + Add the Audio/Video Streaming service to the index file. + +Fri Mar 30 11:12:53 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/*/Makefile: + * apps/*/Makefile: + * docs/*/Makefile: + * examples/*/Makefile: + * netsvcs/*/Makefile: + * performance-tests/*/Makefile: + * tests/*/Makefile: + * websvcs/*/Makefile: + * ASNMP/*/Makefile: + Regenerate dependencies. + +Fri Mar 30 08:15:26 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/QoS/QoS_Session.h: + Add #include for ACE_QoS_Export + +Fri Mar 30 07:31:54 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/QoS/QoS_Session.h: + Fixed export macro + +Thu Mar 29 20:14:00 2001 Craig Rodrigues <crodrigu@bbn.com> + + * ace/SOCK.h: + Remove include of QoS_Session.h, since it is not used here. + +Thu Mar 29 19:48:00 2001 Craig Rodrigues <crodrigu@bbn.com> + + * ace/QoS_Session.h: + * ace/QoS/QoS_Manager.h: + * ace/QoS/QoS_Session_Impl.h: + * ace/QoS/QoS_Session_Factory.h: + * examples/QOS/QoS_Signal_Handler.h: + * examples/QOS/Receiver_QoS_Event_Handler.h: + * examples/QOS/client.cpp: + * examples/QOS/QoS_Util.h: + * examples/QOS/Sender_QoS_Event_Handler.h: + * examples/QOS/server.cpp: + * examples/QOS/Makefile: + + Move QoS_Session.h to the ace/QoS directory. + +Thu Mar 29 19:12:38 2001 Steve Huston <shuston@riverace.com> + + * include/makeinclude/rules.lib.GNU: AIX-specific changes to + build shared libraries by making a shared shr.o file and putting + that into an archive. Seems weird, but that's the way AIX does + things. This makes ACE consistent with other AIX software. + + * include/makeinclude/platform_aix4_cset++.GNU: Made some changes + to attempt to work with the new scheme for shared lib creation on + AIX. Did not test it, and don't plan to. The CSet++ compiler is not + supported by IBM any longer, and Riverace is not supporting ACE + with it. If someone out there sends patches for this, I'll put + them in, but this file is going away after ACE 5.2 is released. + All uses of IBM-supported compilers (IBM C/C++ and Visual Age C++ + in batch mode) should be with the platform_aix_ibm.GNU file. + +Thu Mar 29 16:16:07 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/Token.cpp (renew): A conditional expression used an && rather + and ||, which was causing problems with ACE_Token. Thanks to + Carsten Madsen <com@navicon.dk> for reporting this. + + * ace/Message_Queue_T.cpp: If any of the various ACE_Message_Queue_Ex + enqueue*() methods fail then make sure to release the message + blocks! Thanks to Boris Kolpackov <bosk@ipmce.ru> for reporting + this. + +Wed Mar 28 21:39:26 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/NT_Service.h: + + Changed the ACE_NT_SERVICE macros to use ACE_TEXT_* API + calls for those that can take in unicode strings. + + * examples/NT_Service/main.cpp: + + Fixed use of ACE_NT_SERVICE to work with ACE_USES_WCHAR. + + * examples/OS/Process/process.cpp: + * examples/Reactor/WFMO_Reactor/test_directory_changes.cpp: + + Changed some Win32 API calls to use ACE_TEXT_* equivalents. + + * ace/ace_wchar.h: + + Added all the ACE_TEXT_* API macros needed above. + + Thanks to Nick Pratt <npratt@microstrategy.com> for + reporting the first of these errors. + +Wed Mar 28 22:07:03 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * tests/tests.dsw: Fixed project dependencies between DLL_Test and + DLL_Test_Impl. Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> + for reporting this. + +Wed Mar 28 20:33:28 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/ACE.cpp: Further improved the implementation of + handle_ready() by simply calling poll() with the timeout + pointer. Thanks to Przemyslaw Marciniak <pmarciniak@lucent.com> + for reporting this. + +Wed Mar 28 17:45:22 2001 Steve Huston <shuston@riverace.com> + + * bin/make_pretty.pl: Adjust the error detector for IBM C/C++ 3.6.6. + + * ace/Containers_T.cpp: Add #include "ace/Log_Msg.h" so IBM C/C++ + can see ACE_DEBUG when compiling template instantiations. + +Wed Mar 28 16:40:24 2001 Luther Baker <luther@cs.wustl.edu> + + * ace/config-all.h + + Removed ACE_WIN32 support for ACE_HAS_POSIX_SEM just because + ACE_HAS_PACE. This can be defined for ACE_WIN32 after we + write more WIN32 emulation. + + * ace/OS.h + * ace/OS.i + * ace/OS.cpp + + PACE updates. + +Wed Mar 28 11:37:09 2001 Fuzz Master D <brunsch@uci.edu> + + * bin/fuzz.pl: + + There are several instances where fuzz gives false + positives, and the code is impossible to fix without + creating compiler warnings. Example: + + void function (CORBA::Environment &ACE_TRY_ENV) + { + #if FOO + some_other_function (ACE_TRY_ENV); + ACE_CHECK; + #else + ACE_UNUSED_ARG (ACE_TRY_ENV); + #endif + } + + So normally ACE_UNUSED_ARG errors can be fixed by keeping + the CORBA::ENvironment unnamed and removing the ACE_UNUSED_ARG, + but in this case it isn't possible. So fuzz now accepts + an ignore command for single line use. The above can be fixed + by changing to: + + void function (CORBA::Environment &ACE_TRY_ENV) + { + #if FOO + some_other_function (ACE_TRY_ENV); + ACE_CHECK; + #else + ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check + #endif + } + +Tue Mar 28 13:03:07 2001 Chad Elliott <elliott_c@ociweb.com> + + * bin/make_pretty.pl: + Modification to recognize HP's future errors as warnings. + +Wed Mar 28 11:34:54 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * ace/CDR_Base.inl: + Removed memset in ACE_CDR::mb_align when ACE_HAS_PURIFY == + 1, since it was causing some TAO unit tests to break (in + particular, the Portable_Interceptors/Service_Context_Manipulation + test). After running Cubit and a few other tests, Purify didn't + notice any more uninitialized memory accesses. Fixes bug #828. + +Wed Mar 28 11:55:39 2001 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_aix_ibm.GNU: New file, replaces + platform_aix_vacpp.GNU for Visual Age C++ 5. Also replaces + use of platform_aix4_cset++.GNU for IBM C/C++ Compilers 3.6.6. + So, for the supported, IBM-supplied compilers (IBM C/C++ 3.6.6 + and Visual Age C++ 5) use this file. If you want to try to keep + using CSet++ 3.4 or earlier, you can keep using + platform_aix4_cset++.GNU, but it's not tested any longer and + will disappear at the next ACE version. If you want to use + Visual Age C++ 4, you should reconsider, and upgrade to version 5. + + * include/makeinclude/platform_aix_vacpp.GNU: Deleted. + + * netsvcs/lib/TS_Clerk_Handler.h: Moved #include "ace/Connector.h" + to be after #include "ace/SOCK_Connector.h" to fix compile error + on AIX, Visual Age C++ 5. + + * ace/config-aix-4.x.h: Clarified comments that this file is for + Visual Age C++ also. Added ACE_DLL_SUFFIX ".a" to match what + is now generated from platform_aix_ibm.GNU. + + * bin/auto_compile: + * bin/make_pretty.pl: Add detection of compile/link warnings and + errors for AIX using the IBM compilers' code. Ignores the multiply + defined symbol warnings from ld if it's an ACE symbol. + + * docs/ACE-development-process.html: Changed to link to Bugzilla so + it works from anywhere. + +Wed Mar 28 10:13:16 2001 Steve Huston <shuston@riverace.com> + + * ace/Makefile.bor: Don't try to build the SSL directory if + SSL_ROOT is not set. + +Wed Mar 28 08:39:26 2001 Carlos O'Ryan <coryan@uci.edu> + + * etc/tao_av.doxygen: + New configuration file for the AV streaming service. Many + thanks to Craig Rodrigues <crodrigu@bbn.com> for converting that + directory. + + * bin/generate_doxygen.pl: + Add the new configuration file. + +Tue Mar 27 19:54:11 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Disable POA/On_Demand_Loading and POA/Loader for Linux/KCC + builds, because that compiler has problems with destructors + after dynamic loading. + Also add the new Hello test to the nightly regression tests. + +Tue Mar 27 19:43:39 2001 Carlos O'Ryan <coryan@uci.edu> + + * include/makeinclude/platform_linux.GNU: + Add support for Insure++ + + * include/makeinclude/rules.local.GNU: + Add new macro to let developers change the default destination + for the dependencies. + + * include/makeinclude/wrapper_macros.GNU: + Let the user override the default VDIR directory, and define the + default values for the IDL generated code extensions. + + Thanks to Jody Hagins <jody@atdesk.com> for all these + improvements. + +Tue Mar 27 19:15:36 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Unbounded_Queue.h: + Add required #include for Chorus builds. + +Tue Mar 27 15:28:56 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/ACE.cpp (handle_ready): Don't try to dereference through + a NULL timeout pointer! Thanks to Przemyslaw Marciniak + <pmarciniak@lucent.com> for reporting this. + +Tue Mar 27 10:08:44 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Select_Reactor_Base.h: + Add missing #include for builds that define + ACE_HAS_REACTOR_NOTIFICATION_QUEUE. + +Tue Mar 27 05:35:38 2001 Christopher Kohlhoff <chris@kohlhoff.com> + + * include/makeinclude/make_flags.bor: + Prevent PASCAL build by default with BCB5 since it is not required. + Since both VCL and non-VCL applications share a common run-time + library you can simply link your VCL code with a non-PASCAL build + of the ACE+TAO libraries. This behaviour can be overridden by + defining the FORCE_PASCAL flag. + + * include/makeinclude/build_core_exe.bor: + * include/makeinclude/build_core_library.bor: + * include/makeinclude/build_dll.bor: + * include/makeinclude/build_exe.bor: + * include/makeinclude/build_lib.bor: + * include/makeinclude/clean.bor: + Build all executables into a directory below the source directory. + Core executables are then copied to the common bin directory. This + is to allow the test scripts to assume all executables can be + found relative to the source directory. + + * include/makeinclude/recurse.bor: + Removed definition of OBJFILES since Borland make doesn't seem to + support recursive macro expansion. + + * ace/config-win32-borland.h: + * include/makeinclude/ace_flags.bor: + Always explicitly define __ACE_INLINE__, with it defaulting to 1. + This change will allow the same compiler flags to be used in user + applications regardless of whether a debug or non-debug build of + ACE is being used. + +Tue Mar 27 09:48:33 2001 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/ace_flags.bor + Corrected the smartproxies_cflags + + * examples/IPC_SAP + Added new BCB makefiles for these examples + + * ace/Timer_Hash_T.cpp + * ace/Timer_Hash_T.h + * ace/Timer_Heap_T.cpp + * ace/Timer_Heap_T.h + * ace/Timer_List_T.cpp + * ace/Timer_List_T.h + * ace/Timer_Wheel_T.cpp + * ace/Timer_Wheel_T.h + Made the isdone method on the iterator classes constant + + * ace/Timer_Queue_T.h + * ace/Timer_Queue_T.i + Several get methods are now const + Argument of set_timer_value and set_interval is now passed by const reference + + * ace/Unbounded_Set.h + * ace/Unbounded_Set.cpp + * tests/Collection_Test.cpp + Added the ACE_Unbounded_Set_Const_Iterator which can be used + to iterate over an const set + +Mon Mar 26 21:02:24 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/Log_Msg_NT_Event_Log.cpp: + + Fixed a compilation problem with RegSetValueEx when + ACE_USES_WCHAR and UNICODE were defined. Thanks to Nick + Pratt <npratt@microstrategy.com> for reporting this. + + * ace/ace_dll.dsp: + + Unchecked the "separate types" option for debug linking. + Thanks to Nick Pratt for this suggestion also. + +Mon Mar 26 13:00:37 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Node.h: + * ace/Node.cpp: + * ace/Array_Base.h: + * ace/Array_Base.inl: + * ace/Array_Base.cpp: + * ace/Unbounded_Queue.h: + * ace/Unbounded_Queue.inl: + * ace/Unbounded_Queue.cpp: + * ace/Unbounded_Set.h: + * ace/Unbounded_Set.inl: + * ace/Unbounded_Set.cpp: + * ace/Containers_T.h: + * ace/Containers_T.i: + * ace/Containers_T.cpp: + Move several containers to their own file. This reduces the + amount of code that needs to be parsed, improving compilation + time (not to mention the fact that the code becomes more + readable.) + For backwards compatibility the Containers file still includes + the new smaller files. + + * ace/Makefile: + * ace/Makefile.am: + * ace/Makefile.bor: + Add new files to the install rules. + Since they are templates they do not need to be compiled on MSVC + so no changes to the project files are required. + + * ace/ARGV.h: + * ace/ARGV.cpp: + * ace/Future.h: + * ace/Handle_Gobbler.h: + * ace/Local_Name_Space.h: + * ace/Malloc_Base.h: + * ace/Memory_Pool.h: + * ace/Name_Space.h: + * ace/Priority_Reactor.h: + * ace/Remote_Name_Space.h: + * ace/Service_Config.h: + * ace/Signal.cpp: + * ace/Signal.h: + * ace/Stats.h: + * ace/Thread_Manager.h: + * ace/Timeprobe_T.h: + * ace/Timer_Heap_T.h: + * ace/Timer_Queue_Adapters.h: + * ace/TkReactor.cpp: + To reduce compilation and recompilation times we only include + the header file that includes the container used in each case, + instead of the full containers class. + +Fri Mar 23 12:40:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp: Make sure + to delete the Consumer_Dispatch_Set * that we get back from + unbind(). Thanks to the ever vigilant Mike Winter + <mwinter@sonic.net> for reporting this. + +Thu Mar 22 10:18:24 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/SString.h: Make the various data members protected + rather than private so subclasses can access them. Thanks to + Martin Krumpolec <krumpo@pobox.sk> for this suggestion. + + * tests/README: Clarified some things about the tests. + Thanks to Eric Desamore <Eric.Desamore@idtv.bull.net> for + motivating this. + +Mon Mar 26 11:03:22 2001 Balachandran <bala@cs.wustl.edu> + + * ACE version 5.1.14 released. + +Sat Mar 24 07:02:35 2001 Chris Cleeland <cleeland_c@ociweb.com> + + * ace/INET_Addr.i (get_host_addr): Added a const_cast to the + VxWorks-only arm that casts away const on the this ptr so that + inet_ntoa_b can access and fill in the buffer data member that's + used to hold the result from inet_ntoa_b. Thanks to Erik Johannes + <ejohannes@oresis.com> for point this out. + +Fri Mar 23 18:01:05 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * bin/auto_run_tests.lst: Some of the tests cannot be run in + Single threaded configurations. Prevented such tests from + running in the nightly builds. + +Fri Mar 23 16:25:18 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/New_Fail_Test.cpp: Reverted the change from "Fri Mar 23 + 06:34:33 2001 Balachandran Natarajan <bala@cs.wustl.edu>". The + change fails to comipile when exceptions are on. + +Fri Mar 23 08:47:29 2001 Carlos O'Ryan <coryan@uci.edu> + + * apps/Gateway/Gateway/Options.cpp: + Explicitly #include Log_Msg.h, on platforms that do not define + ACE_TEMPLATES_REQUIRE_SOURCE the header file is not implicitly + included. This should fix compilation problems on Tru64/CXX and + SunCC/4.2 + +Fri Mar 23 06:34:33 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/New_Fail_Test.cpp: Fixed a stupid warning in g++, + No_AMI_Messaging builds. Surprising that it showed up only in + this build. + +Thu Mar 22 21:33:37 2001 Chris Cleeland <cleeland_c@ociweb.com> + + * ace/INET_Addr.h: VxWorks' inet_ntoa doesn't behave like most + others, and our use was causing memory leaks. VxWorks prefers + that you use its own inet_ntoa_b, which takes the buffer to fill + as an argument. Thus, for VxWorks, added a data member char buf + of the appropriate length so that get_host_addr can use + inet_ntoa_b to fill that in. + + * ace/INET_Addr.i (get_host_addr): For VxWorks only, changed this + to use the preferred inet_ntoa_b. This eliminate memory leaks + under VxWorks. Thanks to Erik Johannes <ejohannes@oresis.com> for + the suggested fix. + +Wed Mar 21 19:20:02 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * apps/Gateway/Peer/Peer.cpp (nonblk_put): Fixed a compile error + in g++. + +Wed Mar 21 17:28:26 2001 Steve Huston <shuston@riverace.com> + + * ace/Message_Queue.h: + * ace/Message_Queue_T.h: Moved definition of typedef for + ACE_DEFAULT_MESSAGE_QUEUE_TYPE from Message_Queue.h to + Message_Queue_T.h, just after defining ACE_Message_Queue<>. + Fixes the case where Message_Queue_T.h is included first, + it includes Message_Queue.h before ACE_Message_Queue<> is + defined, and that breaks the compile. IBM C/C++ hit this. + +Wed Mar 21 16:42:19 2001 Steve Huston <shuston@riverace.com> + + * bin/auto_compile: Added an option: -notao to ignore the TAO aspects + of the non-configurable things, like looking at the TAO/ChangeLog. + Also, now looks for auto_run_tests.lst in the $BUILD/bin directory, + not the $MODULE/bin directory - this allows some builds to specify + their own lists. + +Wed Mar 21 16:00:56 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + The followings are contributions from Scott Snyder + <snyder@fnal.gov> to make ACE happy on Digital UNIX with KCC + 3.4d. + + * include/makeinclude/platform_tru64_kcc.GNU: + * include/makeinclude/platform_osf1_4.0_kcc.GNU: Added KCCOPTS and + support for tru64 unix. + + * ace/OS.h: On this platform, we ran into problems with sigwait + being a macro. The fix that had been added for this was keyed + on __DECCXX_VER, so it isn't picked up on this platform. + + * ace/Sock_Connect.cpp: Enum_Interface_Test failed on this + platform. The code in Socket_Connect.cpp that implements this + is conditional on `__unix' being defined. However, with this + compiler, we get `unix' and `__unix__' defined, but not + `__unix'. Fixed by testing for `__unix__' too. + + * ace/ACE.cpp: Cache_Conn_Test was failing. It looks like the + code in ACE::out_of_handles doesn't have a case to handle osf1. + +Wed Mar 21 12:08:35 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + The followings are contributions from Scott Snyder + <snyder@fnal.gov> to make ACE happy on IRIX 6.x with KCC 3.4d. + + * include/makeinclude/platform_irix6.x_kcc.GNU: + Disable the following warings and separate common options into + $(KCCOPTS). + + 280: declaration of a member with the same name as its class Get + this from <netinet/in.h>. + + 608: this pragma must immediately precede a declaration or + statement Get this from <ucontext.h>. + + * ace/OS.h: Changed to only request RTLD_GROUP and RTLD_NODELETE + if they are actually available. + + * ace/config-irix6.x-kcc.h: Undefined + ACE_LACKS_PLACEMENT_OPERATOR_DELETE since KCC actually supports it. + + Config_Test was failing because with the default setup, ace + tries to locate the shared memory pool at 0x04000000. But it + turns out that this is the same address at which irix likes to + load the KCC shared library, libKCC.so. So the memory pool ends + up blowing away all the library code. Fixed by shifting the + default base address to 0x05000000 for this configuration. + + OS_Test was failing because on irix, kcc 4.0d miscompiles + memchr_emulation if +K3 optimization is used. I worked around + this by just using the library version of memchr instead: + + * ace/ACE.cpp: Cached_Conn_Test was failing because the code in + ACE::out_of_handles doesn't have a case to handle irix. + + * tests/DLL_Test.cpp: It died trying to run object dtors. Fixed by + turning off the close-on-destruction flag for this test. + +Wed Mar 21 13:33:58 2001 Ossama Othman <ossama@uci.edu> + + * examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp: + + Patched this file so that the example actually works. It now + correctly interacts with the SSL client in this example. Thanks + to Defang Zhou <dzhou@inktomi.com> for contributing the + patch/changes necessary to make it work. + +Wed Mar 21 07:23:15 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * tests/SOCK_Connector_Test.cpp (find_another_host): Make the + test a bit more resilent against errors with gethostbyname(). + Thanks to Lu Yunhai <luyunhai@huawei.com> for this fix. + +Tue Mar 20 17:31:21 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/run_test.lst: + The Logging_Strategy_Test dynamically loads the Logger service + (from netsvcs), therefore it does not work on static builds. + +Tue Mar 20 18:17:24 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/OS.i: Fixed the USYNC_PROCESS arm of CreateMutex() in + ACE_OS::mutex_init() so that it calls + ACE_OS::set_errno_to_last_error(). Thanks to Ram Ben-Yakir + <Ram@bandwiz.com> for reporting this. + +Tue Mar 20 01:33:24 2001 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): + * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): + * ace/SSL/SSL_SOCK_Stream.i (send, close): + + Wrap the underlying OpenSSL calls in a do-while(SSL_pending()) + loop. I decided to wrap the SSL_write() calls just in case. + This should fix the last of the non-blocking IO issues in ACE's + SSL wrappers. [Bug 393] + +Tue Mar 20 00:40:43 2001 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_SOCK_Stream.i (recv): + + Fixed non-blocking IO support for this method. It was necessary + to ensure that a full SSL record was read before returning + control to the caller. Note that the send() method doesn't need + modification since OpenSSL always writes a full record before + returning. [Bug 393] + +Mon Mar 19 19:53:34 2001 Carlos O'Ryan <coryan@uci.edu> + + * include/makeinclude/ace_flags.bor: + Define macros for the RT Event Service test library + +Mon Mar 19 16:57:43 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/TP_Reactor.cpp (handle_events): Return value from + handle_events() after the Reactor has been deactivated should be + -1. We just need to remember that as illustrated in + ACE_Reactor::run_reactor_event_loop(), this is not an error: + + if (result == -1 && this->implementation_->deactivated ()) + return 0; + + * tests/Thread_Pool_Reactor_Test.cpp (svr_worker): Changed this + function to call ACE_Reactor::run_reactor_event_loop() instead + of ACE_Reactor::handle_events(). In the previous revision, we + were not handling return values from + ACE_Reactor::handle_events() correctly when + ACE_Reactor::deactivated() had been called. + +Mon Mar 19 09:14:12 2001 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_chorus4.x_g++.GNU: + + Added an output option to the link command. Linking would fail + in cases where the output was specified in another directory. + +Sun Mar 18 22:12:16 2001 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_SOCK_Stream.i (close): + + Commented out debugging output that was inadvertently committed + to the repository. + + Don't bother invalidating the handle. Doing so can potentially + cause some side-effects in the underlying OpenSSL + implementation since setting the handle in the SSL_SOCK_Stream + also causes the OpenSSL SSL_set_fd() function to be called. + + Fixed a socket leak caused by the fact that the handle was + invalidated before the underlying ACE_SOCK_Stream was closed. + +Sun Mar 18 09:46:47 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/New_Fail_Test.cpp: Fixed warnings in g++. + +Sun Mar 18 08:31:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * apps/Gateway/Gateway, + * apps/Gateway/Peer: Added a number of fixes to the Gateway and Peer + applications. Thanks to Lu Yunhai <luyunhai@huawei.com> for + contributing these. + +Sun Mar 18 08:31:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * examples/IPC_SAP/FILE_SAP/client.cpp (main): Added a couple of + casts so that the arguments passed to printf() will match the + format specifier types. + +Sat Mar 17 18:02:28 2001 Steve Huston <shuston@riverace.com> + + * ace/config-aix-4.x.h: Fixed settings for exceptions and + placement delete to be ok for Visual Age C++ 5. + + * include/makeinclude/platform_aix_vacpp.GNU: Basically new, + works with the Visual Age C++ 5 batch mode build on AIX. + + * include/makeinclude/rules.lib.GNU: Added aix_build piece to + the section for linking a shared library. It uses the linker + to generate a shr.o (shared) file, then inserts that into + the library that's being built. This new section is only + used with platform_aix_vacpp.GNU at this point. + +Fri Mar 16 15:07:23 2001 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_Context.h (set_mode): + + Changed the default mode from SSLv3 to SSLv23, i.e. support + SSLv2 and SSLv3 by default. This fixes interoperability + with applications that use Sun's JSSE, which only supports + SSLv2. Thanks to Max Khon <fjoe@newst.net> for providing the + patch. + +Thu Mar 15 17:47:28 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/Log_Msg_Test.cpp: Changed a ERROR message as a DEBUG + message. If it is an error message the scripts that run the + build gets confused. + +Thu Mar 15 17:42:54 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/Logging_Strategy_Test.cpp: Changed the "-s" option in the + test to write the output in to the output generated in the "log" + directory. This is just a hack to make the scoreboard clean. + +Thu Mar 15 15:55:37 2001 Steve Huston <shuston@riverace.com> + + * ace/Message_Queue_T.h: Add #include "ace/Message_Queue.h" so + IBM Visual Age C++ sees ACE_Message_Queue_Base when instantiating + templates. + + * ace/ace-dll.icc: Fixed after being munged in a previous commit. + Also, corrected libACE.a generation and cleanup, and incorporated + fixes from Steve Ige <steve.ige@reuters.com> and Jerry + Odenwelder <jerryo@atl.fundtech.com>. + + * THANKS: Added Steve Ige to the Hall of Fame. + +Thu Mar 15 11:26:35 2001 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_SOCK_Acceptor.i (ACE_SSL_SOCK_Acceptor): + + Make sure the handle is set for the ACE_SSL_SOCK_Acceptor, after + initializing the underlying ACE_SOCK_Acceptor. This ensures + that OpenSSL has the proper handle. Thanks to Greg McCain + <greg.mccain@veritas.com> for suggesting this fix. + + * THANKS: + Added Greg to the hall of the fame. + +Thu Mar 15 05:46:59 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/FILE_Addr.cpp (ACE_FILE_Addr): Make sure to divide the size of + the filename_ by the sizeof (ACE_TCHAR) to handle unicode + correctly. Thanks to the ever vigilant Ivan Murphy for catching + this! + +Wed Mar 14 01:47:10 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * apps/Gateway/Gateway/Makefile: + * apps/Gateway/Peer/Makefile: + * apps/JAWS/server/Makefile: + * apps/gperf/tests/Makefile: + * examples/ASX/CCM_App/Makefile: + * examples/Service_Configurator/IPC-tests/server/Makefile: + * examples/Service_Configurator/Misc/Makefile: + * examples/Timer_Queue/Makefile: + * netsvcs/clients/Naming/Client/Makefile: + * netsvcs/clients/Naming/Dump_Restore/Makefile: Removed + unnecessary 'LIBS += $(ACELIB)'. They were causing link problem + for the latest KCC. compiner. + +Tue Mar 13 20:56:10 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/WFMO_Reactor.cpp (remove_to_be_added_handler_i): + * ace/WFMO_Reactor.cpp (remove_suspended_handler_i): + * ace/WFMO_Reactor.cpp (remove_handler_i): + + If a user tried to (a) remove a "to be suspended handle" from + either the current info set or the to be added set, the handle + was correctly removed but the "to be suspended handle" count was + not reduced; (b) remove a "to be resumed handle" from the + suspended set, the handle was correctly removed but the "to be + resumed handle" count was not reduced. Since the "to be resumed + handle" and the "to be suspended handle" were not adjusted + properly, the reactor kept waking up thinking that changes were + required. Thanks to Lu Yunhai <luyunhai@huawei.com> for + reporting this problem. + + * examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp: Added + an extensive example for regression testing the above use cases. + +Tue Mar 13 15:23:04 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Service_Manager.cpp (list_services): Fixed Unicode bugs. + +Tue Mar 13 15:13:48 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * tests/Logging_Strategy_Test.cpp: Fixed Unicode related bugs. + +Tue Mar 13 10:04:06 2001 Carlos O'Ryan <coryan@uci.edu> + + * performance-tests/TCP/run_test.pl: + Fixed the path to the $ACE_ROOT/bin directory, now the script + runs again. + +Tue Mar 13 06:04:03 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Service_Manager.cpp (list_services): Add an indication of whether + a service is active or paused. Thanks to Mike Curtis for this + improvement. + + * ace/Reactor.h: Clarified that the remove_handler (handle, mask) + method also removes the event handle. Thanks to Pierre Fayolle + <fayolle@enseirb.fr> for reporting this. + + * tests/Logging_Strategy_Test.cpp (get_statistic): Replace struct stat + with ACE_stat. Thanks to Johnny Willemsen for reporting this. + +Tue Mar 13 00:35:35 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/Select_Reactor_T.i (deactivated): Reverted this change + regarding Select_Reactor_T::deactivated(): + + Thu Feb 22 12:28:15 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + Though my change improved correctness of access and change to + the <deactivated_> variable, it had a negative consequence: the + event loop calls Select_Reactor_T::deactivated() before calling + Select_Reactor_T::handle_events() to make sure that the reactor + is not closed yet. Unfortunately, if + Select_Reactor_T::deactivated() has a guard, it will send a null + event waking up the current leader and thus lead to unnecessary + thrashing. For now, I have removed the guard from the + Select_Reactor_T::deactivated() methods. We should revisit this + issue some time again. This fixes bug 816. + +Mon Mar 12 16:30:32 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/Logging_Strategy_Test.cpp (main): Fixed the rest of the + warnings in VxWorks builds. + +Mon Mar 12 16:21:42 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/Logging_Strategy_Test.cpp (main): Fixed a couple of + warnings in VxWorks build. Couple of more warnings are left. + +Mon Mar 12 14:16:03 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Local_Name_Space_T.cpp (create_manager_i): Fixed a compile + error on Win32 Unicode platforms. + +Mon Mar 12 12:12:36 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ACE-INSTALL.html: Also mentioned Windows 2000 explicitly in the + document. Thanks to Rahul Shukla <rshukla@ggn.aithent.com> for + raising the question. + +Mon Mar 12 00:49:24 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * tests/tests.dsw: + * tests/Logging_Strategy_Test.dsp: Added a new dsp file. + +Sun Mar 11 21:00:16 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_compile: + Print out the config.h and platform_macros.GNU files, this is + useful when debugging builds. + +Sun Mar 11 18:41:08 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/CDR_Stream.h: Updated a comment to clarify that the buffer() + method just returns a pointer to the first block in the chain. + Thanks to Johnny Willemsen for pointing this out. + +Sun Mar 11 17:46:45 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Local_Name_Space_T.cpp: Fixed a compiler error on Win32 + Unicode platforms. + +Sun Mar 11 17:28:40 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/QoS/QoS_Session_Impl.cpp (rsvp_callback): <errflags> was unused. + +Sun Mar 11 08:31:05 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * tests/Makefile.bor (NAMES): Added Logging_Strategy_Test. + +Sun Mar 11 07:32:18 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/Logging_Strategy_Test.cpp (order): Fixed a warning in g++ + builds. + +Sat Mar 10 23:15:10 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Fixed name of Crashed_Callback test + +Sat Mar 10 19:28:30 PST 2001 Mayur Deshpande <mayur@ics.uci.edu> + + * include/makeinclude/platform_qnx_rtp_gcc.GNU: + Fixes to enable debugging on QNX without ACE crashing. + Thanks to Andy Olson for the suggestions. + +Sat Mar 10 19:05:38 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/config-win32.h: + + Include config-win32-common.h even on Windows CE. + + * ace/config-win32-msvc-6.h: + + If ACE_ENDTHREADEX is already defined, don't define it. + + * ace/OS_Dirent.h: + + Changed the use of ACE_WINCE to ACE_HAS_WINCE. + + * ace/Service_Manager.cpp: + + Fixed a couple of ACE_TCHAR/ACE_LIB_TEXT problems. + + * ace/ace_wchar.h: + + On Windows CE, #include wtypes.h. + + * ace/ace_dll.vcp: + * ace/ace_os_dll.vcp: + + Redid the output files and directories. Now intermediate + files go into Release/PLATFORM and Debug/PLATFORM (where + PLATFORM = MIPS/ARM/X86EM/SH3/SH4). The *.lib files go + into ../Lib/PLATFORM and the *.dll into ../bin/PLATFORM. + Also, the DLL's were renamed from ace_dll.dll and + ace_os_dll.dll to ace[d].dll and ace_os[d].dll. + + * bin/pippen.pl: + + Changed the environment variables from DEFAULT_COMPILER and + DEFAULT_CONFIGS to PIPPEN_COMPILER and PIPPEN_CONFIGS. Also + used \Q\E for the configs because some of the Windows CE + configs confused the script because they use parentheses. + +Sat Mar 10 16:59:51 2001 Carlos O'Ryan <coryan@uci.edu> + + * ACE-INSTALL.html: + Remove references to the now obsolete config-linux-lxpthreads.h + and platform_linux_lxpthread.GNU + +Sat Mar 10 16:38:22 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/run_test.lst: + Running the Recursive_Mutex_Test on single-threaded builds makes + very little sense. + +Sat Mar 10 16:35:19 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Add new tests: Muxing, Crashed_Callback, Client_Leaks and + Server_Leaks to the nightly runs. + +Sat Mar 10 17:55:53 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * include/makeinclude: Zapped the platform_linux_pthread.GNU, + platform_linux_lxpthread.GNU, and platform_linux_lxpthreads.GNU + files since they are confusing and shouldn't not be used in + favor of platform_linux.GNU. + + * ace: Zapped the config-linux.pthread.h and config-linux-lxpthreads.h + file since they are confusing and shouldn't not be used in favor + of config-linux.h. Thanks to Craig Rodrigues for this + suggestion. + +Sat Mar 10 12:39:16 2001 Craig Rodrigues <crodrigu@bbn.com> + + * ace/Reactor.h: + * ace/WFMO_Reactor.h: + * ace/Select_Reactor_T.h: + * ace/Reactor_Impl.h: + Cleaned up comment for schedule_timer() + +Sat Mar 10 07:05:16 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * tests: Added Logging_Strategy_Test.cpp. Thanks to Orlando + Ribeiro <oribeiro@inescporto.pt> for contributing this. + + * tests/Makefile (BIN): Added Logging_Strategy_Test. + + * tests/run_test.lst: Added Log_Msg_Test and + the new Logging_Strategy_Test. + + * tests/Log_Msg_Test.cpp: Added ACE_TEXT macros to all the ACE_DEBUG and + ACE_ERROR calls. + + * ace/Service_Manager.{h,cpp}: Refactored the request processing + code so that it's in a single place. Also, added support to + enable remote reconfiguration. Thanks to Mike Curtis + <mccurry@my-deja.com> for contributing this. + + * ace/Logging_Strategy.cpp (parse_args): Fixed a mistaken + re-initialization of the thread_priority_mask_ and the + process_priority_mask_. Thanks to Martin Krumpolec + <krumpo@pobox.sk> for reporting this. + + * ace/Local_Name_Space_T.cpp (create_manager_i): Fixed this code so that + it doesn't fail if run on a directory that doesn't support locks + (like some NFS mounts). Thanks to scott snyder + <snyder@fnal.gov> for reporting this. + + * tests/SOCK_Connector_Test.cpp: Split up a loop so that the test + doesn't hang on RedHat Linux 7.0. Thanks to Michael Searles + <msearles@base16.com> for this fix. + +Fri Mar 9 22:39:28 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Svc_Conf.h: + * ace/Service_Config.h: + * ace/Service_Config.cpp: + Add new method to the Service Configurator to add static + services into the repository, this factors out common code used + in the ORB and ACE. In general it fixes the hacks done this + past Feb 20th + +Fri Mar 9 16:47:15 2001 Priyanka Gontla <pgontla@ece.uci.edu> + + * bin/nightlybuilds/builds.lst (LIST): + Added HPUX to the scoreboard. + +Fri Mar 9 14:34:34 2001 Chad Elliott <elliott_c@ociweb.com> + + * PACE/Makefile: + * apps/drwho/Makefile: + * bin/PerlACE/Process_Unix.pm: + * include/makeinclude/platform_chorus4.x_g++.GNU: + + Modifications to make things build and run correctly with + Chorus 4.0.1. + +Thu Mar 8 08:38:01 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + The Single_Threaded_POA test cannot run with minimum CORBA or + (isn't this ironic) on single threaded configurations. + +Wed Mar 07 20:25:51 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/nightlybuilds/builds.lst: + Add QNX to the configurations in the scoreboard. + +Wed Mar 7 12:41:05 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Select_Reactor_T.h, + * ace/Reactor_Impl.h, + * ace/WFMO_Reactor.h, + * ace/Reactor.h: Updated the comments to be more accurate. Thanks + to Craig Rodrigues for reporting this. + +Wed Mar 7 08:57:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/Asynch_IO.h: + Changed use of ACE_UNIMPLEMENTED_FUNC to just defining the + assignment operators outright. The point here is to just + provide any implementation, since the default one is flagged as + causing infinite recursion. + + Thanks to David Levine for pointing out this incorrect usage of + the macro. + + * ace/config-win32-msvc-5.h: + * ace/config-win32-msvc-6.h: + + @file comments were mismatched. + + * ace/config-win32.h: + + Changed config-win32-wince.h to config-WinCE.h. + + * ace/ace_wchar.h: + * ace/Log_Msg_NT_Event_Log.cpp: + + Changed several system calls to ACE_TEXT_* (and needed to + add some to ace_wchar.h) since they need the ACE_TEXT + treatment. + +Wed Mar 7 08:20:01 2001 Chad Elliott <elliott_c@ociweb.com> + + * ace/ARGV.cpp: + + Removed a warning about possible use of uninitialized variable. + + * bin/ace_ld: + + Added new functionality to filter out the harmless symbol size + change warnings for VxWorks 5.4. + + * examples/Shared_Malloc/test_multiple_mallocs.cpp: + * examples/Shared_Malloc/test_persistence.cpp: + * examples/Shared_Malloc/test_position_independent_malloc.cpp: + + Renamed the typedef MALLOC to TEST_MALLOC. A MALLOC macro is + defined by a VxWorks system header. + +Wed Mar 7 06:11:52 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Asynch_IO.h: Removed the unnecessary/improper ';' at the + end of the line. Thanks to Johnny Willemsen and Chris Kohlhoff + for reporting/fixing this. + + * ace/*_Connector.h: Clarified in the comments that the + ACE_Time_Value *timeout represents the *maximum* amount of time + to wait. If the server is not running, however, connect() can + return much sooner. Thanks to Dipti Jain <dijain@hss.hns.com> + for motivating this. + +Tue Mar 6 14:14:06 2001 Darrell Brunsch <brunsch@uci.edu> + + Here are some fixes for MSVC 7 beta. Note that no project files + are checked in. Right now they will have to be generated from + the MSVC 5/6 files (The devenv.exe will do this automatically). + When MSVC 7 becomes released, we'll probably have to deal with + including their files (even if only for nightly builds). + + * ace/OS.h: + * ace/config-win32-msvc.h: + + Moved the inclusion of the crtdbg.h file to where it is being + used. This is mainly to alleviate some excessive inclusions. + + * ace/config-WinCE.h: + * ace/config-win32.h: + * ace/config-win32-msvc-5.h: (added) + * ace/config-win32-msvc-6.h: (added) + * ace/config-win32-msvc-7.h: (added) + * ace/config-win32-borland.h: + * ace/config-win32-common.h: + * ace/config-win32-ghs.h: + * ace/config-win32-msvc.h: + * ace/config-win32-visualage.h: + + Added a new config-win32-msvc-7.h with some new settings. While + doing this I also rearranged the files a bit. Everything now + goes through config-win32.h (and an error will occur if you + include the others directly). + + * ace/config-hpux-10.x-hpc++.h: + * ace/config-hpux-11.00.h: + * ace/config-win32-msvc-5.h: + * ace/config-win32-msvc-6.h: + * ace/README: + + Removed ACE_HAS_ONE_DEFINITION_RULE. Could not find this + actually used anywhere so I'm assuming it can be safely + removed. + + * ace/Asynch_IO.h: + + Added some dummy assignment operators. It seems that the default + ones produce infinite recursion (at least with MSVC 6 SP5 and + MSVC 7 beta) + + * ace/Future.h: + + Future_Holder needs to be ACE_Export-ed. + +Tue Mar 6 16:58:17 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/ACE.cpp (format_hexdump): The format_hexdump () was missing + a space if the remaining message that needs dumping was less + than 16 bytes. Thansk to Johnny Willemsen" + <johnny.willemsen@meco.nl> for giving this fix. + +Tue Mar 6 11:25:53 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/PerlACE/Process_Unix.pm: + Ignore SIGABRT too, because it is used by abort() and we call + that function to test the ORB under fault conditions. + +Tue Mar 6 12:25:34 2001 Chad Elliott <elliott_c@ociweb.com> + + * configure.in: + + The configure script was broken on major releases (i.e. those with + no beta numbers). A test for an empty string should have double + quotes around the variable. + +Tue Mar 6 10:16:31 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/config-win32-common.h: + Removed old comment about ACE_HAS_WINSOCK2 being related to + ACE_HAS_WINNT4. Thanks to Johnny Willemsen + <jwillemsen@remedy.nl> for pointing this out. + +Tue Mar 6 10:13:03 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/RMCast/RMCast_Fragment_Test.cpp: + * tests/RMCast/RMCast_Membership_Test.cpp: + * tests/RMCast/RMCast_Reassembly_Test.cpp: + * tests/RMCast/RMCast_Reordering_Test.cpp: + * tests/RMCast/RMCast_Retransmission_Test.cpp: + Use ACE_OS::time(0) to initialize the pseudo-random numbers + seed. It is good enough for our purposes, and it works on + platforms without 64-bit integer support. + +Mon Mar 5 13:56:33 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Synch_T.{h,i}: Further simplified the new ACE_Guard constructor. + Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing + this. + +Mon Mar 5 19:20:45 2001 Fuzz Master D <brunsch@uci.edu> + + * bin/fuzz.pl: + As Ossama pointed out, the ACE_CHECK test was seeing + problems in the tao_idl files since it has uses of ACE_TRY_ENV + inside quotes. Made sure not to detect problems in this case. + +Mon Mar 5 18:58:32 2001 Fuzz Master D <brunsch@uci.edu> + + * bin/fuzz.pl: + Fixed some false positives in the resolve_initial_reference + test and also added an ACE_CHECK test by Carlos's request. + +Mon Mar 5 18:54:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/PerlACE/Process_Unix.pm: + Updated the signal detection to not pay attention to TERM and + KILL. Will print out better output when signals cause a process + to exit during most calls like Kill () or TerminateWaitKill (). + +Mon Mar 5 13:56:33 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Synch_T.{h,i}: Added a new ACE_Guard constructor that + allows the caller to select whether the guard owns/acquires the + lock or not. Thanks to Chris Kohlhoff <chris@kohlhoff.com> for + contributing this. + + * ace/Synch_T.{h,i}: Added a disown() method that relinquishes + ownership of the lock so that it is not released implicitly in + the destructor. Thanks to Chris Kohlhoff <chris@kohlhoff.com> + for contributing this. + + * ace/Event_Handler.h: Updated the comment on handle_close() so that + it more accurately reflects what is going on. Thanks to Defang + Zhou <dzhou@inktomi.com> for suggesting this. + + * apps/Gateway/Gateway/Concrete_Connection_Handlers.{h,cpp}: Added + handle_close() operations to solve problems with certain + concurrency models. Thanks to Defang Zhou <dzhou@inktomi.com> + for reporting this. + +Mon Mar 5 11:29:36 2001 Carlos O'Ryan <coryan@uci.edu> + + * docs/ACE-categories.html: + Fixed links to the doxygen files. + + * ace/Pipe.cpp: + Fixed what looks like a typo, we want to *disable* the stream + pipes under QNX, not to enable them just on that platform. + +Mon Mar 5 08:20:21 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/RMCast/RMCast_Fragment_Test.cpp: + * tests/RMCast/RMCast_Reassembly_Test.cpp: + Undo Doug's changes. They broke the test. + +Mon Mar 5 07:52:52 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Log_Record.cpp (priority): Clarified the behavior of the + priority() set/get methods. Thanks to Christian Schuhegger + <Christian.Schuhegger@cern.ch> for reporting this. + + * tests/RMCast/RMCast_Fragment_Test.cpp, + * tests/RMCast/RMCast_Reassembly_Test.cpp, + * tests/Dynamic_Priority_Test.cpp, + * tests/Thread_Pool_Test.cpp: Make sure to write into the + wr_ptr() rather than the rd_ptr(). Thanks to Gonzalo Diethelm + <Gonzalo.Diethelm@sonda.com> for reporting this. + +Mon Mar 5 08:00:23 2001 Chad Elliott <elliott_c@ociweb.com> + + * bin/nightlybuilds/builds.lst: + + Added new VxWorks 5.4 and Chorus 4.0.1 nightly builds. + +Mon Mar 05 00:10:15 2001 Ossama Othman <ossama@uci.edu> + + * bin/fuzz.pl: + + Updated to detect missing ACE_TRY_ENV parameters in + ORB::resolve_initial_references() calls when emulated exceptions + are used. Thanks to Darrell for providing this update. + +Mon Mar 5 07:57:07 2001 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Makefile.bor: + + Added missing Refcounted_Auto_Ptr_Test to the build + +Sun Mar 4 19:31:16 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/auto_run_tests.lst: + + Added the run_test_mt.pl for Leader_Follers. + + * bin/PerlACE/Process_Unix.pm: + * bin/PerlACE/Process_Win32.pm: + + Added a destructor to detect if a process wasn't explicitly + killed before the object went out of scope. Will print out + an error and kill it. + + * bin/PerlACE/Run_Test.pm: + + Turned on autoflush for all scripts. + + * docs/run_test.txt: + + Updated run_test.pl instructions to fit all the changes I + just made. + + * examples/Export/run_test.pl: + * performance-tests/RPC/run_test.pl: + * performance-tests/TCP/run_test.pl: + * performance-tests/UDP/run_test.pl: + + Updated to use PerlACE::Run_Test; + + * tests/Atomic_Op_Test.dsp: + * tests/Auto_IncDec_Test.dsp: + * tests/Barrier_Test.dsp: + * tests/Basic_Types_Test.dsp: + * tests/Buffer_Stream_Test.dsp: + * tests/CDR_Array_Test.dsp: + * tests/CDR_File_Test.dsp: + * tests/CDR_Test.dsp: + * tests/Cache_Map_Manager_Test.dsp: + * tests/Cached_Accept_Conn_Test.dsp: + * tests/Cached_Conn_Test.dsp: + * tests/Capabilities_Test.dsp: + * tests/Collection_Test.dsp: + * tests/Config_Test.dsp: + * tests/Conn_Test.dsp: + * tests/DLL_Test.dsp: + * tests/DLList_Test.dsp: + * tests/Dirent_Test.dsp: + * tests/Dynamic_Priority_Test.dsp: + * tests/Enum_Interfaces_Test.dsp: + * tests/Env_Value_Test.dsp: + * tests/Future_Set_Test.dsp: + * tests/Future_Test.dsp: + * tests/Handle_Set_Test.dsp: + * tests/Hash_Map_Bucket_Iterator_Test.dsp: + * tests/Hash_Map_Manager_Test.dsp: + * tests/High_Res_Timer_Test.dsp: + * tests/IOStream_Test.dsp: + * tests/Lazy_Map_Manager_Test.dsp: + * tests/Log_Msg_Test.dsp: + * tests/MEM_Stream_Test.dsp: + * tests/MM_Shared_Memory_Test.dsp: + * tests/MT_Reactor_Timer_Test.dsp: + * tests/MT_SOCK_Test.dsp: + * tests/Malloc_Test.dsp: + * tests/Map_Manager_Test.dsp: + * tests/Map_Test.dsp: + * tests/Mem_Map_Test.dsp: + * tests/Message_Block_Test.dsp: + * tests/Message_Queue_Notifications_Test.dsp: + * tests/Message_Queue_Test.dsp: + * tests/Message_Queue_Test_Ex.dsp: + * tests/Naming_Test.dsp: + * tests/New_Fail_Test.dsp: + * tests/Notify_Performance_Test.dsp: + * tests/OS_Test.dsp: + * tests/Object_Manager_Test.dsp: + * tests/OrdMultiSet_Test.dsp: + * tests/Pipe_Test.dsp: + * tests/Priority_Buffer_Test.dsp: + * tests/Priority_Reactor_Test.dsp: + * tests/Priority_Task_Test.dsp: + * tests/Process_Manager_Test.dsp: + * tests/Process_Mutex_Test.dsp: + * tests/Process_Strategy_Test.dsp: + * tests/RB_Tree_Test.dsp: + * tests/Reactor_Exceptions_Test.dsp: + * tests/Reactor_Notify_Test.dsp: + * tests/Reactor_Performance_Test.dsp: + * tests/Reactor_Timer_Test.dsp: + * tests/Reactors_Test.dsp: + * tests/Reader_Writer_Test.dsp: + * tests/Recursive_Mutex_Test.dsp: + * tests/Refcounted_Auto_Ptr_Test.dsp: + * tests/Reverse_Lock_Test.dsp: + * tests/SOCK_Connector_Test.dsp: + * tests/SOCK_Send_Recv_Test.dsp: + * tests/SOCK_Test.dsp: + * tests/SPIPE_Test.dsp: + * tests/SString_Test.dsp: + * tests/SV_Shared_Memory_Test.dsp: + * tests/Semaphore_Test.dsp: + * tests/Service_Config_Test.dsp: + * tests/Sigset_Ops_Test.dsp: + * tests/Simple_Message_Block_Test.dsp: + * tests/Svc_Handler_Test.dsp: + * tests/TSS_Test.dsp: + * tests/Task_Test.dsp: + * tests/Thread_Manager_Test.dsp: + * tests/Thread_Mutex_Test.dsp: + * tests/Thread_Pool_Reactor_Test.dsp: + * tests/Thread_Pool_Test.dsp: + * tests/Time_Service_Test.dsp: + * tests/Time_Value_Test.dsp: + * tests/Timeprobe_Test.dsp: + * tests/Timer_Queue_Test.dsp: + * tests/Tokens_Test.dsp: + * tests/UPIPE_SAP_Test.dsp: + * tests/Upgradable_RW_Test.dsp: + * tests/version_tests/Atomic_Op_Test.dsp: (removed) + * tests/version_tests/Auto_IncDec_Test.dsp: (removed) + * tests/version_tests/Barrier_Test.dsp: (removed) + * tests/version_tests/Basic_Types_Test.dsp: (removed) + * tests/version_tests/Buffer_Stream_Test.dsp: (removed) + * tests/version_tests/CDR_Array_Test.dsp: (removed) + * tests/version_tests/CDR_File_Test.dsp: (removed) + * tests/version_tests/CDR_Test.dsp: (removed) + * tests/version_tests/Cache_Map_Manager_Test.dsp: (removed) + * tests/version_tests/Cached_Accept_Conn_Test.dsp: (removed) + * tests/version_tests/Cached_Conn_Test.dsp: (removed) + * tests/version_tests/Capabilities_Test.dsp: (removed) + * tests/version_tests/Collection_Test.dsp: (removed) + * tests/version_tests/Config_Test.dsp: (removed) + * tests/version_tests/Conn_Test.dsp: (removed) + * tests/version_tests/DLL_Test.dsp: (removed) + * tests/version_tests/DLList_Test.dsp: (removed) + * tests/version_tests/Dirent_Test.dsp: (removed) + * tests/version_tests/Dynamic_Priority_Test.dsp: (removed) + * tests/version_tests/Enum_Interfaces_Test.dsp: (removed) + * tests/version_tests/Env_Value_Test.dsp: (removed) + * tests/version_tests/Future_Set_Test.dsp: (removed) + * tests/version_tests/Future_Test.dsp: (removed) + * tests/version_tests/Handle_Set_Test.dsp: (removed) + * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: (removed) + * tests/version_tests/Hash_Map_Manager_Test.dsp: (removed) + * tests/version_tests/High_Res_Timer_Test.dsp: (removed) + * tests/version_tests/IOStream_Test.dsp: (removed) + * tests/version_tests/Lazy_Map_Manager_Test.dsp: (removed) + * tests/version_tests/Log_Msg_Test.dsp: (removed) + * tests/version_tests/MEM_Stream_Test.dsp: (removed) + * tests/version_tests/MM_Shared_Memory_Test.dsp: (removed) + * tests/version_tests/MT_Reactor_Timer_Test.dsp: (removed) + * tests/version_tests/MT_SOCK_Test.dsp: (removed) + * tests/version_tests/Malloc_Test.dsp: (removed) + * tests/version_tests/Map_Manager_Test.dsp: (removed) + * tests/version_tests/Map_Test.dsp: (removed) + * tests/version_tests/Mem_Map_Test.dsp: (removed) + * tests/version_tests/Message_Block_Test.dsp: (removed) + * tests/version_tests/Message_Queue_Notifications_Test.dsp: (removed) + * tests/version_tests/Message_Queue_Test.dsp: (removed) + * tests/version_tests/Message_Queue_Test_Ex.dsp: (removed) + * tests/version_tests/Naming_Test.dsp: (removed) + * tests/version_tests/New_Fail_Test.dsp: (removed) + * tests/version_tests/Notify_Performance_Test.dsp: (removed) + * tests/version_tests/OS_Test.dsp: (removed) + * tests/version_tests/Object_Manager_Test.dsp: (removed) + * tests/version_tests/OrdMultiSet_Test.dsp: (removed) + * tests/version_tests/Pipe_Test.dsp: (removed) + * tests/version_tests/Priority_Buffer_Test.dsp: (removed) + * tests/version_tests/Priority_Reactor_Test.dsp: (removed) + * tests/version_tests/Priority_Task_Test.dsp: (removed) + * tests/version_tests/Process_Manager_Test.dsp: (removed) + * tests/version_tests/Process_Mutex_Test.dsp: (removed) + * tests/version_tests/Process_Strategy_Test.dsp: (removed) + * tests/version_tests/RB_Tree_Test.dsp: (removed) + * tests/version_tests/Reactor_Exceptions_Test.dsp: (removed) + * tests/version_tests/Reactor_Notify_Test.dsp: (removed) + * tests/version_tests/Reactor_Performance_Test.dsp: (removed) + * tests/version_tests/Reactor_Timer_Test.dsp: (removed) + * tests/version_tests/Reactors_Test.dsp: (removed) + * tests/version_tests/Reader_Writer_Test.dsp: (removed) + * tests/version_tests/Recursive_Mutex_Test.dsp: (removed) + * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (removed) + * tests/version_tests/Reverse_Lock_Test.dsp: (removed) + * tests/version_tests/SOCK_Connector_Test.dsp: (removed) + * tests/version_tests/SOCK_Send_Recv_Test.dsp: (removed) + * tests/version_tests/SOCK_Test.dsp: (removed) + * tests/version_tests/SPIPE_Test.dsp: (removed) + * tests/version_tests/SString_Test.dsp: (removed) + * tests/version_tests/SV_Shared_Memory_Test.dsp: (removed) + * tests/version_tests/Semaphore_Test.dsp: (removed) + * tests/version_tests/Service_Config_Test.dsp: (removed) + * tests/version_tests/Sigset_Ops_Test.dsp: (removed) + * tests/version_tests/Simple_Message_Block_Test.dsp: (removed) + * tests/version_tests/Svc_Handler_Test.dsp: (removed) + * tests/version_tests/TSS_Test.dsp: (removed) + * tests/version_tests/Task_Test.dsp: (removed) + * tests/version_tests/Thread_Manager_Test.dsp: (removed) + * tests/version_tests/Thread_Mutex_Test.dsp: (removed) + * tests/version_tests/Thread_Pool_Reactor_Test.dsp: (removed) + * tests/version_tests/Thread_Pool_Test.dsp: (removed) + * tests/version_tests/Time_Service_Test.dsp: (removed) + * tests/version_tests/Time_Value_Test.dsp: (removed) + * tests/version_tests/Timeprobe_Test.dsp: (removed) + * tests/version_tests/Timer_Queue_Test.dsp: (removed) + * tests/version_tests/Tokens_Test.dsp: (removed) + * tests/version_tests/UPIPE_SAP_Test.dsp: (removed) + * tests/version_tests/Upgradable_RW_Test.dsp: (removed) + * tests/version_tests/run_all_tests.bat: (removed) + * tests/version_tests/version_tests.dsw: (removed) + + Moved the version_tests back into the tests/*.dsp files. The + reason they were originally moved is because it was easier to + select all the debug versions during a batch build. But now we + have pippen.pl and msvc_auto_compile.pl, so this is no longer an + issue, while this strange setup would compilicate the nightly + builds. Thus, it was standardized back. + + * bin/create_vt_dsps.pl: (removed) + + No need for this anymore. + +Sun Mar 4 19:27:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/Log_Msg.cpp: + * ace/Log_Msg_NT_Event_Log.h: + * ace/OS.cpp: + + Disabled Log_Msg_NT_Event_Log on Windows CE. + +Sun Mar 04 13:19:35 2001 Carlos O'Ryan <coryan@uci.edu> + + * etc/tao.doxygen: + Add .txt files, so we can add web pages to the basic TAO + documentation. + +Sun Mar 04 10:58:08 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: Added Log_Msg_NT_Event_Log.{h,cpp} to NT + project files. + +Sun Mar 4 10:41:57 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Log_Msg.cpp, + ace/Log_Msg.h, + ace/Logging_Strategy.cpp, + ace/Makefile.bor, + ace/OS.cpp, + ace/OS.h, + ace/OS.i, + ace/ace.rc: Added support for the new NT event logging capability. + Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing this. + + * ace/Log_Msg_NT_Event_Log.cpp + ace/Log_Msg_NT_Event_Log.h + ace/ace_message_table.bin: Added these files to support the new + NT event logging capability. + Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing + this. + +Sun Mar 4 04:46:44 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/nightlybuilds/builds.lst: + + Added new Windows CE nightly build. + +Sun Mar 04 03:12:17 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * bin/generate_export_file.pl: ACE_AS_STATIC_LIBS was incorrectly + typed in as ACE_STATIC_LIBS. + + * ace/svc_export.h: + * ace/RMCast/RMCast_Export.h: + * ace/SSL/SSL_Export.h: + * websvcs/lib/websvcs_export.h: These files didn't check for + ACE_AS_STATIC_LIBS to determine if they should define their + export macros for static build. Thanks to Chris Kohlhoff + <chris@kohlhoff.com> for reporting this. [Bug 813] + +Sat Mar 3 19:07:31 2001 Pradeep Gore <pradeep@cs.wustl.edu> + + * ace/QoS/QoS_Session_Impl.cpp: + * ace/QoS/QoS_Session_Impl.i: + * examples/QOS/Fill_ACE_QoS.cpp: + * examples/QOS/Fill_ACE_QoS.h: + * examples/QOS/Makefile: + * examples/QOS/QoS_Util.cpp: + * examples/QOS/Receiver_QoS_Event_Handler.cpp: + * examples/QOS/Sender_QoS_Event_Handler.cpp: + Fixed various compile warnings when compiling with rapi=1 on + Redhat Linux 6.2 + +Sat Mar 3 16:47:53 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/fuzz.pl: + + Changed the detection pattern a bit to pick up + stuff like: + + void + operator < (...) + + better. + + * ace/Auto_Ptr.i: + * ace/Base_Thread_Adapter.cpp: + * ace/Based_Pointer_T.i: + * ace/Connector.cpp: + * ace/Containers_T.cpp: + * ace/DEV_Addr.i: + * ace/Dynamic.i: + * ace/FILE.cpp: + * ace/Flag_Manip.i: + * ace/Handle_Set.i: + * ace/Hash_Map_Manager_T.cpp: + * ace/Lib_Find.cpp: + * ace/Local_Name_Space_T.cpp: + * ace/Local_Tokens.cpp: + * ace/MEM_Addr.i: + * ace/Malloc.cpp: + * ace/Malloc_Allocator.cpp: + * ace/Malloc_T.cpp: + * ace/Memory_Pool.cpp: + * ace/Message_Block.cpp: + * ace/Message_Block.i: + * ace/Message_Block_T.cpp: + * ace/Message_Queue.i: + * ace/Message_Queue_T.cpp: + * ace/Message_Queue_T.i: + * ace/Naming_Context.cpp: + * ace/OS.cpp: + * ace/OS.i: + * ace/PI_Malloc.cpp: + * ace/POSIX_Asynch_IO.cpp: + * ace/Process_Manager.cpp: + * ace/QtReactor.cpp: + * ace/RB_Tree.i: + * ace/RW_Process_Mutex.cpp: + * ace/Reactor.cpp: + * ace/Remote_Name_Space.cpp: + * ace/Remote_Tokens.cpp: + * ace/SOCK_Dgram.i: + * ace/SString.cpp: + * ace/SUN_Proactor.cpp: + * ace/Select_Reactor_Base.cpp: + * ace/Select_Reactor_T.cpp: + * ace/Service_Object.i: + * ace/Service_Repository.cpp: + * ace/Signal.cpp: + * ace/Signal.i: + * ace/Svc_Handler.cpp: + * ace/Synch.cpp: + * ace/Synch_T.cpp: + * ace/Thread_Adapter.cpp: + * ace/Thread_Manager.cpp: + * ace/Timer_Heap_T.cpp: + * ace/TkReactor.cpp: + * ace/Token.cpp: + * ace/Token_Manager.cpp: + * ace/CLASSIX/CLASSIX_CO_Acceptor.i: + * ace/CLASSIX/CLASSIX_Select_Reactor.cpp: + * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp: + * netsvcs/ACE-netsvcs.html: + * netsvcs/lib/Server_Logging_Handler_T.cpp: + * netsvcs/lib/Token_Handler.cpp: + + Fixed bad ACE_TRACE and ACE_OS_TRACE's. (fuzz errors) + + * docs/ACE-categories.html: + * docs/ACE-porting.html: + * docs/ACE-subsets.html: + * docs/tutorials/new-tutorials.html: + + Changed references to + http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to + relative paths instead (Fixes the last of the fuzz errors). + +Fri Mar 2 20:08 Angelo Corsaro <corsaro@cs.wustl.edu> + + * include/makeinclude/platform_qnx_rtp_gcc.GNU: + Added macros tha expand to multiple libraries + on QNX RTP to fix most of the link problems. + +Fri Mar 2 16:35:58 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/config-win32-borland.h: + + Added /**/ to #include <vcl.h> so it isn't picked up by + MSVC-based dependency generators. + +Fri Mar 02 19:36:22 2001 Steve Huston <shuston@riverace.com> + + * ace/OS.i (ACE_OS::send): (only non-Win32), if call fails and + errno is EAGAIN, change it to EWOULDBLOCK. Improve portability + for platforms where EAGAIN and EWOULDBLOCK are different values + and both used, like HP-UX. Thanks to Michael Grove + <snowymike@aol.com> for reporting this problem. + + * ace/ACE.i (send_i): Call ACE_OS::send, not ACE_OS::write, on HP-UX. + This makes it pick up the EAGAIN->EWOULDBLOCK change. + + * tests/TSS_Test.cpp: Avoid doing ACE_Thread::keyfree on where + ACE_HAS_PTHREADS_DRAFT4 or ACE_HAS_PTHREADS_DRAFT6 (unless + ACE_HAS_TSS_EMULATION is also defined) since ACE_Thread::keyfree + will get ENOTSUP anyway. + +Fri Mar 02 17:50:40 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> + + * ace/QtReactor.cpp: + Thanks to Stefan Scherer <stefan_scherer@sepp.de> for reporting + and fixing the problem - crashing of TAO/tests/QtTests/ client + example after moving the slider. + +Fri Mar 02 15:35:40 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_Acceptor.cpp: + * ace/MEM_Acceptor.h: + * ace/MEM_Addr.cpp: + * ace/MEM_Addr.h: + * ace/MEM_Connector.cpp: + * ace/MEM_Connector.h: + * ace/MEM_IO.cpp: + * ace/MEM_IO.h: + * ace/MEM_SAP.cpp: + * ace/MEM_SAP.h: + * ace/MEM_Stream.cpp: + * ace/MEM_Stream.h: Disabled MEM_Stream support if one chooses + not to support position independent pointers. + +Fri Mar 02 13:17:36 2001 Steve Huston <shuston@riverace.com> + + * examples/IOStream/server/iostream_server.cpp (main): Removed the + call to register peer_acceptor with the reactor. The + acceptor::open call already registers for ACCEPT_MASK. Prevents + leaving a hanging READ_MASK registered after the acceptor is + destroyed when main() returns. This fixes Bugzilla # 801. Thanks + to Pim Philipse <pph@rogan-medical.com> for reporting this. + + * THANKS: Added Pim Philipse to the Hall of Fame. + +Fri Mar 02 12:24:27 2001 Steve Huston <shuston@riverace.com> + + * ace/config-hpux-10.x-hpc++.h: If compiling without exceptions + (+noeh) then don't set ACE_HAS_EXCEPTIONS (don't set + ACE_NEW_THROWS_EXCEPTIONS either). + + * ace/Thread_Manager.cpp (join_thr): Moved the code for + ACE_HAS_PTHREADS_DRAFT4 that does a pthread_detach from here to + ACE_OS::thr_join (which this function calls) so that + ACE_Thread::join also causes a pthread_detach. This is needed on + Pthreads Draft 4 (HP-UX 10.x) to properly clean up the thread + storage and avoid leaking memory. Thanks to Vladimir Kondratiev + <vladimir.kondratiev@intel.com> for reporting this and providing + excellent test cases to help resolve it quickly. + + * ace/OS.i (ACE_OS::thr_join): Added the code that was removed from + ACE_Thread_Manager::join_thr, above. + + * ace/Event_Handler.cpp (~ACE_Event_Handler): Add an ACE_Errno_Guard + around purge_pending_notifications to prevent against an ENOTSUP + from purge_pending_notifications. + +Thu Mar 1 17:02:10 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/PerlACE/Process_Unix.pm: + * bin/PerlACE/Process_Win32.pm: + + Fixed up the Spawn code to use the Executable () instead of + {EXECUTABLE}, since that's how we get the adjusted name (with + .exe and stuff). And also skipped the file existance with + IgnoreExeSubDir, since IgnoreExeSubDir is often used when you + need to find the program in the path. + +Thu Mar 1 15:48:10 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/fuzz.pl: + + Fuzz was being a bit to eager with the class matching in the + TRACE test. It was having problems with something like: + + char *foo::bar () + + since it thought the class was "char *foo" instead of just + "foo". + + But it is feeling muuuuuuch better now. + +Thu Mar 1 13:18:07 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/fuzz.pl: + + Added two new tests: + + - absolute ACE_wrappers test: + + Check for ~schmidt/ACE_wrappers in html files. These should + be relative links since these html files already exist in + their own ACE_wrappers tree. + + - TRACE test: + + Does a check on whether the ACE_TRACE or ACE_OS_TRACE actually + refers to the function/method it is in. + + And expanded the checks in the bad run_test test (level 6) + + * bin/PerlACE/Process_Unix.pm: + * bin/PerlACE/Process_Win32.pm: + + - Added checks for file existence before running. + - Added IgnoreExeSubDir option. + - Added TerminateWaitKill method. + + * bin/pippen.pl: (added) + * bin/PerlACE/MSProject.pm: (added) + * bin/PerlACE/MSProject/DSP.pm: (added) + * bin/PerlACE/MSProject/VCP.pm: (added) + + There is nothing to see here...please be on your way. + + It isn't like this is a super top secret project to + replace msvc_auto_compile.pl with something that works + better and also has a cool code-name that is shorter + than "msvc_auto_compile.pl". + + But remember, you didn't hear that from me. + +Thu Mar 1 10:54:23 2001 Ossama Othman <ossama@uci.edu> + + * bin/auto_run_tests.lst: + + Added the TAO Codec to the list of tests to run. + + * include/makeinclude/wrapper_macros.GNU: + + Fixed all incorrect uses of CFLAGS and CCFLAGS where + preprocessor macros were defined. Preprocessor macros should be + defined in the CPPFLAGS variable. + + Define ACE_USE_RCSID in non-debug builds (i.e. debug=0). + +Thu Mar 01 07:29:58 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Fixed typos in the Service_Context_Manipulation test. It was + running in platforms where it shouldn't. + +Thu Mar 01 07:07:03 2001 Christopher Kohlhoff <chris@kohlhoff.com> + + * include/makeinclude/recurse.bor: + Added support for makefiles which contain multiple targets. + + * examples/IPC_SAP/SOCK_SAP/Makefile.bor: + * examples/Log_Msg/Makefile.bor: + * examples/Map_Manager/Makefile.bor: + * examples/Mem_Map/file-reverse/Makefile.bor: + * examples/RMCast/Send_File/Makefile.bor: + * examples/Service_Configurator/IPC-tests/client/Makefile.bor: + * examples/Threads/Makefile.bor: + * netsvcs/clients/Logger/Makefile.bor: + * tests/Makefile.bor: + * tests/RMCast/Makefile.bor: + Updated to work with new multi-target makefile support. + +Wed Feb 28 22:58:50 2001 Carlos O'Ryan <coryan@uci.edu> + + * html/index.html: + Reference */index.html directly, instead of assuming that the + web browser will use index.html as the default file, this also + works better when browsing locally. Thanks to Alain Decamps + <Alain.Decamps@pidpa.be> for pointing this out. + +Wed Feb 28 16:41:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * docs/bugzilla-build-setup.html: + + Updated the section about the scoreboard and added a + placeholder for Win32 nightly build information. + +Wed Feb 28 16:04:14 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * bin/nightlybuilds/builds.lst (TYPE): Added a build with AMI and + Messaging support disabled for the nightly builds. + +Wed Feb 28 15:35:59 2001 Joe Hoffert <joeh@cs.wustl.edu> + + * docs/bugzilla-build-setup.html: + Added html file outlining steps for adding a bugzilla nightly + build. + +Wed Feb 28 00:25:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/auto_run_tests.lst: + + The examples/POA/Adapter_Activator/run_test.pl test was being + run twice. In fairness to all the other tests that only get to + run once, I removed the second instance. + +Tue Feb 27 17:31:48 2001 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_hpux_aCC.GNU: Turn on -D_REENTRANT for + the threads=0 build - this enables the reentrant functions which + are present, threads or not. It does not turn on threads, which + are instead enabled by -D_POSIX_C_SOURCE=199506L. + + * ace/config-hpux-11.00.h: Added ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R + + * ace/OS.i (rand_r): Added 'defined (HPUX_11)' to the ways to get to + the POSIX.1c-conformant version of rand_r. Allows clean compile + on HP-UX 11 without thread support. Also lined up some + misaligned #if/else/endif lines to make it easier to find one's + way through. + + * ace/OS_Dirent.inl (readdir_r): Added 'defined (HPUX_11)' to the + ways to get the POSIX.1c-conformant version of readdir_r. Allows + clean compile on HP-UX 11 without thread support. + +Tue Feb 27 11:38:38 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * performance-tests/TCP/tcp_test.cpp (main): Zapped the + non-existent '-f' option. Thanks to Mike Curtis for reporting + this. + + * performance-tests/TCP/tcp_test.cpp (main): Check for improper + bufsz. Thanks to Mike Curtis for reporting this. + + * performance-tests/TCP/tcp_test.cpp (main): Documented the '-t' + option, which specifies the number of threads. + + * performance-tests/TCP/README: Fixed a typo. Thanks to + Mike Curtis for reporting this. + +Tue Feb 27 10:51:18 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * bin/auto_run_tests.lst: Added the AMI tests to the daily + builds. + +Tue Feb 27 10:23:20 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * Makefile: Changed the ChangeLog listing in the CONTROLLED_FILES + to ChangeLog*. This should help us to avoid missing ChangeLog + entries in the beta distribution, just about every time we split + and add a ChangeLog. + +Mon Feb 27 07:39:16 2001 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_hpux_aCC.GNU: + + Removed suppression of Future Error 129. + Removed the use of CFLAGS. + + * ace/OS.h: + * ace/config-hpux-11.00.h: + Modification to remove system header macro definition conflicts. + This change does not suppress the conflicts, but does an undef + of the two conflicting macros before includeing tcp.h. Thanks + to Sam Chong <sam@i2i-inc.com> for reporting this problem. + +Mon Feb 26 19:01:16 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Logging_Strategy.{h,cpp}: Added a new -k option to + set the logging key via the ACE_Logging_Strategy. Thanks to + Chris Kohlhoff <chris@kohlhoff.com> for contributing this. + +Mon Feb 26 18:18:38 2001 Steve Huston <shuston@riverace.com> + + * ace/SString.i + (ACE_CString::find (const char *s, int pos) const): + (ACE_CString::find (char c, int pos) const): + (ACE_SString::find (const char *s, int pos) const): + (ACE_SString::find (char c, int pos) const): + (ACE_WString::find (const ACE_WSTRING_TYPE *s, int pos) const): + If match is found, return index from start of string, not from + 'pos'. Matches the C++ string standard, which was the model for + these classes. Thanks to Glen Osterhout <gosterho@elronsw.com> + for this fix. + + * ace/SString.h: Clarified comments on return value for above + functions. + + * tests/SString_Test.cpp: Changed to look for the correct return + from the npos tests of the functions above. + + * THANKS: Added Glen Osterhout to the Hall of Fame. + +Mon Feb 26 15:01:55 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/DLL_Test_Impl.dsp: + * tests/version_tests/DLL_Test_Impl.dsp: (removed) + Me thinks that the Release and Static configurations should + also compile, and me thinks that it is now fixed. + +Mon Feb 26 12:29:45 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg) + method assumes ownership of <next_arg>, rather than copying it. + Thanks to Steve Hespelt <shespelt@bear.com> for reporting this. + Fixes [Bug 807]. + + The generated version_tests dsp didn't work (since DLL_Test_Impl + creates a library). Manually created the configurations in the + tests/DLL_Test_Impl.dsp version instead. + +Mon Feb 26 15:54:33 2001 Phil Mesnier <mesnier_p@ociweb.com> + + Port to Unixware 7 (7.1.1) Using UDK CC (7.1.1.b) + + * docs/tutorials/013/message_queue.cpp: + * tests/Malloc_Test.cpp: + + Fixed errors in #pragma instiate lines including removal of ';', + mispellings + + * ace/config-all.h: + + Added definition of Unixware UDK for definition of ACE_NOTREACHED() + + * ace/config-unixware-7.1.0.udk.h: + * include/makeinclude/platform_unixware_udk.GNU: + + New configuration files for building on Unixware 7 with UDK CC. + +Mon Feb 26 12:29:45 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg) + method assumes ownership of <next_arg>, rather than copying it. + Thanks to Steve Hespelt <shespelt@bear.com> for reporting this. + Fixes [Bug 807]. + +Mon Feb 26 12:27:46 2001 Jeff Parsons <parsons@cs.wustl.edu> + + * ace/CDR_Stream.h: + * ace/CDR_Stream.i: + Added method to reset the byte order in class OuputCDR. This + will be used by a gateway to set the byte order of a reply to a + reqest it has handled to one different than the gateway's own + byte order, if necessary. It should be called while the stream + is still empty, that is, before any part of the reply, including + the header, has been marshaled. + +Mon Feb 26 12:07:00 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Memory_Pool.cpp: Moved the copying of MMAP flags up before + setting the MAP_FIXED flag. Thanks to <rhuber@amadeus.net> for + reporting this. [Bug 752] + +Mon Feb 26 09:29:36 2001 Carlos O'Ryan <coryan@cs.wustl.edu> + + * ace/RB_Tree.h: + Fully qualified enum name. This fixes problems on gcc-272 builds. + +Mon Feb 26 00:19:28 2001 Darrell Brunsch <brunsch@uci.edu> + + Time to do some spring cleaning... + + * tests/version_tests/Config_Test.dsp: (added) + * tests/version_tests/DLL_Test_Impl.dsp: (added) + * tests/version_tests/Log_Msg_Test.dsp: (added) + * tests/version_tests/Message_Queue_Test_Ex.dsp: (added) + * tests/version_tests/version_tests.dsw: + + Updated the version_tests dir with create_vt_dsps.pl. + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + * netsvcs/lib/netsvcs.dsp: + * netsvcs/servers/servers.dsp: + * tests/ACE_Init_Test.dsp: + * tests/Atomic_Op_Test.dsp: + * tests/Auto_IncDec_Test.dsp: + * tests/Barrier_Test.dsp: + * tests/Basic_Types_Test.dsp: + * tests/Buffer_Stream_Test.dsp: + * tests/CDR_Array_Test.dsp: + * tests/CDR_File_Test.dsp: + * tests/CDR_Test.dsp: + * tests/Cache_Map_Manager_Test.dsp: + * tests/Cached_Accept_Conn_Test.dsp: + * tests/Cached_Conn_Test.dsp: + * tests/Capabilities_Test.dsp: + * tests/Collection_Test.dsp: + * tests/Config_Test.dsp: + * tests/Conn_Test.dsp: + * tests/DLL_Test.dsp: + * tests/DLList_Test.dsp: + * tests/Dirent_Test.dsp: + * tests/Dynamic_Priority_Test.dsp: + * tests/Enum_Interfaces_Test.dsp: + * tests/Env_Value_Test.dsp: + * tests/Future_Set_Test.dsp: + * tests/Future_Test.dsp: + * tests/Handle_Set_Test.dsp: + * tests/Hash_Map_Bucket_Iterator_Test.dsp: + * tests/Hash_Map_Manager_Test.dsp: + * tests/High_Res_Timer_Test.dsp: + * tests/IOStream_Test.dsp: + * tests/Lazy_Map_Manager_Test.dsp: + * tests/Log_Msg_Test.dsp: + * tests/MEM_Stream_Test.dsp: + * tests/MM_Shared_Memory_Test.dsp: + * tests/MT_Reactor_Timer_Test.dsp: + * tests/MT_SOCK_Test.dsp: + * tests/Malloc_Test.dsp: + * tests/Map_Manager_Test.dsp: + * tests/Map_Test.dsp: + * tests/Mem_Map_Test.dsp: + * tests/Message_Block_Test.dsp: + * tests/Message_Queue_Notifications_Test.dsp: + * tests/Message_Queue_Test.dsp: + * tests/Message_Queue_Test_Ex.dsp: + * tests/Naming_Test.dsp: + * tests/New_Fail_Test.dsp: + * tests/Notify_Performance_Test.dsp: + * tests/OS_Test.dsp: + * tests/Object_Manager_Test.dsp: + * tests/OrdMultiSet_Test.dsp: + * tests/Pipe_Test.dsp: + * tests/Priority_Buffer_Test.dsp: + * tests/Priority_Reactor_Test.dsp: + * tests/Priority_Task_Test.dsp: + * tests/Process_Manager_Test.dsp: + * tests/Process_Mutex_Test.dsp: + * tests/Process_Strategy_Test.dsp: + * tests/RB_Tree_Test.dsp: + * tests/Reactor_Exceptions_Test.dsp: + * tests/Reactor_Notify_Test.dsp: + * tests/Reactor_Performance_Test.dsp: + * tests/Reactor_Timer_Test.dsp: + * tests/Reactors_Test.dsp: + * tests/Reader_Writer_Test.dsp: + * tests/Recursive_Mutex_Test.dsp: + * tests/Refcounted_Auto_Ptr_Test.dsp: + * tests/Reverse_Lock_Test.dsp: + * tests/SOCK_Connector_Test.dsp: + * tests/SOCK_Send_Recv_Test.dsp: + * tests/SOCK_Test.dsp: + * tests/SPIPE_Test.dsp: + * tests/SString_Test.dsp: + * tests/SV_Shared_Memory_Test.dsp: + * tests/Semaphore_Test.dsp: + * tests/Service_Config_Test.dsp: + * tests/Sigset_Ops_Test.dsp: + * tests/Simple_Message_Block_Test.dsp: + * tests/Svc_Handler_Test.dsp: + * tests/TSS_Test.dsp: + * tests/Task_Test.dsp: + * tests/Thread_Manager_Test.dsp: + * tests/Thread_Mutex_Test.dsp: + * tests/Thread_Pool_Reactor_Test.dsp: + * tests/Thread_Pool_Test.dsp: + * tests/Time_Service_Test.dsp: + * tests/Time_Value_Test.dsp: + * tests/Timeprobe_Test.dsp: + * tests/Timer_Queue_Test.dsp: + * tests/Tokens_Test.dsp: + * tests/UPIPE_SAP_Test.dsp: + * tests/Upgradable_RW_Test.dsp: + + Removed the Alpha configurations. I don't think we've actually + looked at these for over a year, and they are missing from a lot + of projects. Thankfully, they are easy to recreate if they are + needed. + + * ACE-INSTALL.html: + + Changed the Windows NT Alpha section to mention that we no + longer have configurations out of the box for Win32/Alpha, they + must be recreated if needed. + + * WindozeCE/ACEApp.cpp: (removed) + * WindozeCE/ACEApp.h: (removed) + * WindozeCE/README: (removed) + * WindozeCE/StdAfx.cpp: (removed) + * WindozeCE/StdAfx.h: (removed) + * WindozeCE/WindozeCE.aps: (removed) + * WindozeCE/WindozeCE.clw: (removed) + * WindozeCE/WindozeCE.cpp: (removed) + * WindozeCE/WindozeCE.dsp: (removed) + * WindozeCE/WindozeCE.h: (removed) + * WindozeCE/WindozeCE.rc: (removed) + * WindozeCE/WindozeCEDlg.cpp: (removed) + * WindozeCE/WindozeCEDlg.h: (removed) + * WindozeCE/resource.h: (removed) + * WindozeCE/res/WindozeCE.ico: (removed) + * WindozeCE/res/WindozeCE.rc2: (removed) + + No longer used. + + * Makefile: + + Removed WindozeCE from CONTROLLED_FILES. + + * tests/WinCE/Atomic_Op_Test.dsp: (removed) + * tests/WinCE/Barrier_Test.dsp: (removed) + * tests/WinCE/Basic_Types_Test.dsp: (removed) + * tests/WinCE/Buffer_Stream_Test.dsp: (removed) + * tests/WinCE/Conn_Test.dsp: (removed) + * tests/WinCE/DLL_Test.dsp: (removed) + * tests/WinCE/Enum_Interfaces_Test.dsp: (removed) + * tests/WinCE/Future_Test.dsp: (removed) + * tests/WinCE/Handle_Set_Test.dsp: (removed) + * tests/WinCE/Hash_Map_Manager_Test.dsp: (removed) + * tests/WinCE/MT_Reactor_Timer_Test.dsp: (removed) + * tests/WinCE/MT_SOCK_Test.dsp: (removed) + * tests/WinCE/Map_Manager_Test.dsp: (removed) + * tests/WinCE/Mem_Map_Test.dsp: (removed) + * tests/WinCE/Message_Block_Test.dsp: (removed) + * tests/WinCE/Message_Queue_Notifications_Test.dsp: (removed) + * tests/WinCE/Message_Queue_Test.dsp: (removed) + * tests/WinCE/Notify_Performance_Test.dsp: (removed) + * tests/WinCE/OrdMultiSet_Test.dsp: (removed) + * tests/WinCE/Priority_Buffer_Test.dsp: (removed) + * tests/WinCE/Priority_Task_Test.dsp: (removed) + * tests/WinCE/Reactor_Exceptions_Test.dsp: (removed) + * tests/WinCE/Reactor_Notify_Test.dsp: (removed) + * tests/WinCE/Reactor_Performance_Test.dsp: (removed) + * tests/WinCE/Reactor_Timer_Test.dsp: (removed) + * tests/WinCE/Reactors_Test.dsp: (removed) + * tests/WinCE/Reader_Writer_Test.dsp: (removed) + * tests/WinCE/Recursive_Mutex_Test.dsp: (removed) + * tests/WinCE/SOCK_Connector_Test.dsp: (removed) + * tests/WinCE/SOCK_Test.dsp: (removed) + * tests/WinCE/SString_Test.dsp: (removed) + * tests/WinCE/Semaphore_Test.dsp: (removed) + * tests/WinCE/Sigset_Ops_Test.dsp: (removed) + * tests/WinCE/Simple_Message_Block_Test.dsp: (removed) + * tests/WinCE/TSS_Test.dsp: (removed) + * tests/WinCE/Task_Test.dsp: (removed) + * tests/WinCE/Thread_Manager_Test.dsp: (removed) + * tests/WinCE/Thread_Mutex_Test.dsp: (removed) + * tests/WinCE/Thread_Pool_Test.dsp: (removed) + * tests/WinCE/Time_Value_Test.dsp: (removed) + * tests/WinCE/Timer_Queue_Test.dsp: (removed) + * tests/WinCE/ce_tests.dsw: (removed) + + Removed these Windows CE Toolkit for Visual C++ files. + +Mon Feb 26 00:15:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/DLL_Test_Impl.dsp: + + Made sure the Code Generation settings were correct. + +Sun Feb 25 19:40:11 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/ACEutils.pm (CheckForConfig): + This routine was not removing all the -Config options from the + command-line, causing problems in some of the tests. + +Sun Feb 25 16:33:26 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/DLL_Test.cpp: + + Left the DLL end with a d in debug mode, but changed + the test to add the d when _DEBUG and ACE_WIN32 is + defined. Test should now work again on Win2000_Debug. + +Sun Feb 25 11:28:06 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/run_test.pl: + + When there are errors in the log, print out the entire + log. This should make it much easier to understand + problems in the nightly build logs. + +Sun Feb 25 09:04:43 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/DLL_Test.cpp: + Accidentally left the 'd' suffix in the name of the DLL. + +Sat Feb 24 22:58:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/msvc_auto_compile.pl: + * TAO/TAOACE.dsw: + * TAO/TAOACE_Static.dsw: + * Static_Performance.dsw: + + Removed references to gperf_lib.dsp + + * TAO/version_tests.dsw: (removed) + + This was still referring to orbsvcs.dsp, which shows that + it is way out of date (and not used). Zapped. + +Sat Feb 24 20:59:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * apps/gperf/src/gperf.dsp: + * apps/gperf/src/gperf.dsw: + * apps/gperf/src/gperf_lib.dsp: (removed) + + Merged gperf into one project. This will bring the + structure in line with the Makefiles. + +Sat Feb 24 19:28:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS.i: + + Fixed my recent changes to ACE_OS::dlsym () to work on + Windows CE. + +Sat Feb 24 17:50:38 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/DLL_Test.cpp: + + OBJ_PREFIX was being created by attaching a char string to + a ACE_TCHAR string. Needed to add ACE_TEXT to the first + string for compilation on ACE_USES_WCHAR. + + * tests/DLL_Test_Impl.dsp: + + Changed the internal name to "DLL_Test DLL" to make sure + this gets compiled in the first pass by msvc_auto_compile.pl. + + * tests/run_test.pl: + + Added a check for LM_WARNINGs in log files. Let's see if + there have been any hidden (DLL_Test actually was producing + a warning on Windows, but Carlos's fix already got rid of it, + Yay!). + +Sat Feb 24 15:44:58 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/tests.dsw: + * tests/DLL_Test_Impl.dsp: + Add new project file for the shared library used in the test. + + * tests/DLL_Test.cpp: + * tests/DLL_Test_Impl.cpp: + Change the Win32 version to load a shared library instead of the + exe. + +Sat Feb 24 14:07:11 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/Thread_Pool_Reactor_Test.cpp: + + Did a careful study of what this test was doing in regards to + sending wide-character strings, and made it consistent. The + most troublesome aspect was the fact that the length is encoded + in the shutdown string ("\011shutdown") which meant that I had + to send the length in characters, not in bytes. This should + really fix [Bug 537]. + +Sat Feb 24 14:37:00 2001 Craig Rodrigues <crodrigu@bbn.com> + + * ace/config-g++-common.h + gcc 2.97 and higher require the use of the std namespace for + iostrams + +Sat Feb 24 10:27:04 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Disable the interceptor tests when the ORB is compiled without + interceptor support. + + * tests/run_test.lst: + Disable the Reactor_Notify_Test on single threaded builds, it + uses threads. + + * bin/nightlybuilds/scoreboard_update.pl: + Fixed usage message. + +Sat Feb 24 09:45:18 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/run_test.lst: + Disable the DLL_Test on KCC/Linux builds. The test runs + normally, but crashes on shutdown(), it appears as if the + run-time system is invoking the destructors after the library is + unloaded. + + * tests/Makefile: + * tests/Makefile.DLL_Test: + * tests/DLL_Test.h: + * tests/DLL_Test.cpp: + * tests/DLL_Test_Impl.h: + * tests/DLL_Test_Impl.cpp: + Cleanup code, and truly separate the shared library code to a + completely new separate file. + +Sat Feb 24 09:51:45 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_compile: + Pass the -Config options to each script, this helps the + $ACE_ROOT/bin/run_test.pl script that needs to disable some + tests in certain configurations. + +Sat Feb 24 08:21:48 2001 David L. Levine <levine@cs.wustl.edu> + + * include/makeinclude/platform_vxworks5.x_g++.GNU: + added -fno-implicit-templates on Tornado II for Intel 386 + family targets. Thanks to Albert Wijnja <Albert.Wijnja@meco.nl> + for reporting that static template data members weren't really on + VxWorks/386, and to Greg Holtmeyer <greg.holtmeyer@windriver.com> + for confirming that -fno-implicit-templates should work with + the Tornado II g++. [Bug 658] + +Thu Feb 22 15:59:04 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/OS.i: The ACE_TRACE call for ACE_OS::gmtime identified the + function as "localtime". This is now fixed. Thanks to Mason + Deaver <mason.deaver@tripointglobal.com> for reporting this. + +Fri Feb 23 19:44:36 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * ACE version 5.1.13 released. + +Thu Feb 22 12:28:15 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/TP_Reactor.cpp (handle_events): Here is the description of + how things were working and where the problem was: In the + TP_Reactor there is one leader thread waiting in select() and + the others waiting on the token. During deactivation(), the + <deactivation_> flag is set on the reactor, signal_all_threads() + is called on the token, and an empty notification is send to the + current leader thread. signal_all_threads() sets the + <signal_all_threads_> flag on the Token when there are waiters + on the Token (does nothing if there are no waiters). This + scheme worked fine when there were leader and follower threads + waiting. When a new leader is chosen, it returns the magic + number 2 from token.acquire_read() and hence exits gracefully + from the handle_events(). However, the problem was that when + some (or all) of the TP threads are busy running upcalls, + signal_all_threads() was a no-op and the magic number 2 was not + returned from token.acquire_read() and hence the exit from + handle_events() was flagged as an error. + + The fix is as described below: + + (1) ACE_Token::signal_all_threads() does not make sense. The + token is a mutex, not a condition variable. Therefore, it does + not make sense to have a signal_all_threads() methods. Plus I + believe that the method does not do as advertised. Therefore, I + removed this method from the token class. + + (2) There is no need to signal all the threads in the + TP_Reactor. Marking the Reactor as closed and signaling the + leader thread is enough. The leader thread will wake up to + handle the empty event, the next leader will see that the + Reactor is closed and exit gracefully. This will continue until + all the waiters are drained. + + (3) With the above change, there is no need to check for an + magic returns from token.acquire_read(). When a thread gets the + token, it checks the deactivation flag before proceeding. If + the Reactor is closed, it gracefully exits. Otherwise, it + continues as leader. + + (4) Since there is no need to call token.signal_all_threads(), + ACE_TP_Reactor::wakeup_all_threads() can be removed since it is + now the same as ACE_Select_Reactor_T::wakeup_all_threads(). + + Note that this change should help with making + Thread_Pool_Reactor_Test run without shutdown errors. + + * ace/Select_Reactor_T.i (deactivate): The setting of the + <deactivated_> flag and waking up of all the threads should be + atomic. I am being picky about this one but I think am I right. + Also added the guard to the accessor. + +Thu Feb 22 08:51:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS.i: + + Bleh. Changed an && to || to make sure we get a symbolname + variable for non-Unicode Win32. + + "He who lives without committing any folly is not so + wise as he thinks" - La Rochefoucauld + +Thu Feb 22 08:43:30 2001 Carlos O'Ryan <coryan@uci.edu> + + * include/makeinclude/rules.local.GNU: + Add SunWS_cache and ir.out to the list of files removed by + the realclean pseudo-target. This directory is used by Sun/CC + 5.0 (and Forte), if not removed the information there can become + stale, and break the builds. + This should fix the Sun/CC 5.0 nightly builds. + +Thu Feb 22 07:51:36 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/OS.i: Reverted the change "Thu Feb 22 03:31:06 2001 + Krishnakumar B <kitty@ace.cs.wustl.edu> ". + +Thu Feb 22 03:31:06 2001 Krishnakumar B <kitty@ace.cs.wustl.edu> + + * ace/OS.i (dlsym): + Hopefully fixed the Win32 builds. Removed a extra ! in the + #ifdef. + +Thu Feb 22 02:58:36 2001 Krishnakumar B <kitty@ace.cs.wustl.edu> + + * VERSION: + * PROBLEM-REPORT-FORM: + * ace/Version.h: + Reverted the changes and restored the old versions of + these files as the beta build script was killed. Pain :-( + +Wed Feb 21 20:10:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS.i: + * tests/DLL_Test.cpp: + * tests/Thread_Pool_Reactor_Test.cpp: + + Fixed the remaining problems with the Win2000_Unicode tests. + [Bug 537] + +Tue Feb 20 21:19:39 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Svc_Conf.h: + Add ACE_Export macro for ace_create_service_type() it is used + outside the library now. + +Tue Feb 20 06:34:26 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * include/makeinclude/platform_sunos5_g++.GNU: Make sure to explicitly + set ACE_HAS_GNUG_PRE_2_8. Thanks to Christian von Mueffling + <cvm@aiss.de> for reporting this. + + * ace/Thread_Manager.cpp (cancel_grp): Fixed a typo in + the ACE_TRACE macro. Thanks to Mike Curtis for reporting this. + +Mon Feb 19 16:38:08 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * ace/Asynch_Acceptor.{h,cpp}: + Added method void handle (ACE_HANDLE) and made it call the base + class's handle(ACE_HANDLE) method to remove warning about + partial overloading. Fix suggested by Irfan. + +Sun Feb 18 21:55:16 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * ace/OS.h: + Added an extern "C" void ace_mutex_lock_cleanup_adapter before + the definition of ACE_PTHREAD_CLEANUP_PUSH to avoid warnings on + SunCC 5.x. + +Sun Feb 18 17:16:41 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * netsvcs/clients/Tokens/manual/manual.cpp (main), + * tests/Tokens_Test.cpp (main): Reordered the #ifdefs for the + ACE_HAS_TOKENS_LIBRARY stuff. Thanks to Kitty for reporting + this. + +Sun Feb 18 16:28:45 2001 Chris Gill <cdgill@cs.wustl.edu> + + * ace/RB_Tree.h: Changed order of method declarations to (hopefully) + dodge an internal compiler error on VxWorks. + +Sun Feb 18 09:59:18 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * netsvcs/clients/Tokens: + * netsvcs/servers/main.cpp (main): + * netsvcs/servers/svc.conf: + * netsvcs/lib/Token_Handler: Only compile this stuff if the + ACE_HAS_TOKENS_LIBRARY macro is enabled. Thanks to Carlos + for reporting this. + + * ace/Object_Manager.cpp: Added a check for ACE_HAS_TOKENS_LIBRARY + so we can skip initializing certain things if that macro is + undefined. + + * ace/Token_Collection.*: + * ace/Token_Invariants.*: + * ace/Token_Manager.*: + * ace/Local_Tokens.*: + * ace/Remote_Tokens.*: + * ace/Token_Request_Reply.*: + Only compile these files if ACE_HAS_TOKENS_LIBRARY is enabled + since this functionality does not appear to be widely used and + yet it takes up space. + + * tests/Tokens_Test.cpp (main): Only run this test if + ACE_HAS_TOKENS_LIBRARY is defined. + +Sat Feb 17 17:23:46 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/SOCK_Dgram_Mcast.cpp: + + Integrated a fix from Keith Nicewarner <knicewar@erg.sri.com> + In effect, this reverts the multicast code changed on + Fri Jan 26 11:18:15 2001 Douglas C. Schmidt ... + for all platforms except linux. + +Sat Feb 17 15:52:09 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/run_all_list.pm: + * tests/run_tests.pl: + Remove obsolete scripts. + +Sat Feb 17 13:26:17 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/POSIX_Asynch_IO.cpp (thread_function): Make sure to cast + -1 to void * since that's the signature of the method. Thanks + to Bala for reporting this. + + * ace/POSIX_Asynch_IO.cpp (thread_function): Zapped the unused + result local variable and also changed the logic to bailout if + handle_events() returns -1. This fixes a warning reported by + KCC. + +Fri Feb 16 17:39:16 2001 Mayur Deshpande <mayur@ics.uci.edu> + + * ace/config-qnx-rtp.h: Commented out ACE_HAS_NONSTATIC_OBJECT_MANAGER. + Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion. + + * include/makeinclude/platform_qnx_rtp_gcc.GNU: Added -fexceptions to + CCFLAGS and 'exceptions=1' at end of file. + Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion. + +Fri Feb 16 05:37:47 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Logging_Strategy.h: Updated the documentation to explain what + the various options mean. + + * tests/Log_Msg_Test.cpp (test_log_msg_features): Added + ACE_Log_Msg::PROCESS to a couple of priority_mask() calls to + make the test work correctly. Thanks to Kitty for reporting + this. + +Thu Feb 15 17:53:31 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * ace/Thread_Manager.i: Simplified casting in + ACE_Thread_Descriptor::get_next per suggestion from Carlos. + +Thu Feb 15 14:57:59 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * ace/Thread_Manager.i: Fixed typo in ACE_Thread_Descriptor::get_next. + +Thu Feb 15 11:33:55 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * tests/Refcounted_Auto_Ptr_Test.cpp (main): Always call ACE_OS::exit(0) + to make sure that this test terminates... + + * ace/Thread_Manager.i (get_next): Added an ACE_const_cast() to + make certain compilers happy. + + * ace/Logging_Strategy.cpp: Fixed some Unicode problems on Win32. + +Thu Feb 15 08:49:44 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/nightlybuilds/builds.lst: + Rename WashU builds so all the Debian builds appear together. + +Thu Feb 15 07:15:39 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Logging_Strategy.{h,cpp}: Added support to generate multiple + log files, rather than just two. Thanks to Orlando Ribeiro + <oribeiro@inescporto.pt> for this fix. + +Thu Feb 15 03:36:46 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * bin/nightlybuilds/builds.lst (WEB): + Added a new build with TAO_MINIMUM linked statically. + +Wed Feb 14 05:28:59 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Thread_Manager.{h,i}: Added const to state(), grp_id(), + task(), get_next(), and self(). Thanks to Johnny Willemsen + <jwillemsen@remedy.nl> for reporting this. + +Tue Feb 13 17:51:47 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * tests/Makefile.bor (TESTS): Added Dirent_Test to list of TESTS. + Thanks to Mike Curtis for reporting this. + + * tests/run_tests.bat: Fixed a typo so that Dirent_Test will run. + Thanks to Mike Curtis for reporting this. + +Wed Feb 14 12:08:10 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * ace/Read_Buffer.cpp: Fixed boundary condition in rec_read. + If record was a multiple of BUFSIZ and the record was + terminated with an EOF instead of a "term" character, + rec_read would return 0 instead of the actual data read in. + The problem was that the partial buffer fill size was being + checked instead of the total number of bytes read in. This + issue was noticed when trying to read in an IOR file in TAO + that was exactly 512 bytes (BUFSIZ * 2 on Win2k) long. + +Tue Feb 13 14:44:28 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/ace_wchar.inl: Changed several variable from type <size_t> + to type <int> as on 64-bit whistler, size_t and int are not the + same size which confuses 64-bit compiler. (Per Kitty's + request.) + +Tue Feb 13 10:23:31 2001 Steve Huston <shuston@riverace.com> + + * apps/JAWS/server/IO.{h cpp}: (Side-affect necessitated by addition of + handle () method and handle_ member to ACE_Handler). Moved the + handle_ member to the JAWS_Synch_IO class - it needs it, and + JAWS_Asynch_IO class has it by inheritance from ACE_Handler. Left + the handle () methods in JAWS_IO, but made them pure virtual, + implemented in JAWS_Synch_IO (implementation moved from JAWS_IO) + and in JAWS_Asynch_IO, where they forward up to ACE_Handler's + handle () methods. + +Mon Feb 12 18:18:05 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * tests/Thread_Mutex_Test.cpp: + Modified test to use process mutexes for Win32 platforms + so that timed mutexes could be tested. + +Sun Feb 11 15:33:39 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/QoS/ACE_QoS_Export.h: + + Added ACE_AS_STATIC_LIBS support. + + * ace/QoS/ACE_QoS.dsp: + * ace/QoS/ACE_QoS_Lib.dsp: + + Fixed to comply with ACE standards. + +Sun Feb 11 10:50:10 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * include/makeinclude/platform_sunos5_g++.GNU (exceptions): + Only set the -fno-exceptions option if we're *not* using GCC + 2.7.2! Thanks to Pradeep for explaining how to do this. + +Sun Feb 11 10:15:08 2001 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Makefile.bor: + * ace/QoS/Makefile.bor: + * include/makeinclude/ace_flags.bor: + Added build support for QoS library with Borland compiler. + +Sat Feb 10 15:29:08 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Message_Block.h: + Improved documentation for the lenth(), size() and space() + methods. + +Sat Feb 10 07:19:37 2001 Christopher Kohlhoff <chris@kohlhoff.com> + + * include/makeinclude/outputdir.bor: + Removed the now out-of-date comment about pascal/non-pascal + build directories. + + * ace/config-win32-borland.h: + Added support for new ACE_HAS_VCL define to enable inclusion + of VCL header files. + +Fri Feb 9 16:47:44 2001 Pradeep Gore <pradeep@cs.wustl.edu> + + * ace/Makefile.am: + Removed references to the AQoSA files. + +Fri Feb 9 16:42:10 2001 Pradeep Gore <pradeep@cs.wustl.edu> + + * examples/QOS/client.dsp: + * examples/QOS/server.dsp: + Updated the corrected project files. + Thanks to Darrell for pointing this out. + +Thu Feb 8 19:25:03 2001 Carlos O'Ryan <coryan@uci.edu> + + * performance-tests/RPC/run_test.pl: + * performance-tests/TCP/run_test.pl: + * performance-tests/UDP/run_test.pl: + Add driver strings + +Thu Feb 08 19:18:36 2001 Angelo Corsaro <corsaro@cs.wustl.edu> + + * bin/auto_run_tests.lst: + + Removed comment from Exposed Policies test. The test has been fixed. + +Thu Feb 8 14:11:36 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/ws2tcpip.h: [Removed] + + I don't see any reason to have this file in ace; it is a system + header file. And from [Bug 722], our version is out of date anyway. + + * ace/OS.h: + + Changed to include system version of ws2tcpip.h + + * ace/Makefile.am: + * ace/ace-dll.icc: + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + + Removed references to ws2tcpip.h. + + * ace/SOCK_Connect.cpp: + + Changed get_ip_interfaces to remove a memory error. Thanks to + Viatcheslav Batenine <slavikb@infra2000.com> for helping out with + this. + + * ace/SOCK_Dgram_Mcast.cpp: + + It looks like the change made on: + + Fri Jan 26 11:18:15 2001 Douglas C. Schmidt ... + + doesn't work on Win32. Reverted back to the old scheme for Win32 + only. + +Thu Feb 8 00:34:57 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * include/makeinclude/platform_sunos5_g++.GNU: Added support for + -fno-exception when exceptions=0 is given to the Makefile. + Thanks to Christian v. Mueffling <cvm@aiss.de> for reporting + this. + +Wed Feb 7 23:02:46 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/SUN_Proactor.cpp: Fixed the cancel_aiocb() method and added a + new overridden cancel_aio() method. Thanks to Alexander Libman + <Alibman@baltimore.com> for contributing this. + +Thu Feb 8 02:09:05 2001 Pradeep Gore <pradeep@cs.wustl.edu> + + * examples/QOS/Makefile: + * examples/QOS/client.dsp: + * examples/QOS/server.dsp: + Modified to use the ACE_QoS lib. + * Receiver_QoS_Event_Handler.cpp: + * Sender_QoS_Event_Handler.cpp: + Added missing Log_Msg.h for ACE_DEBUG. + Other files were modified to reflect changed directory location + of AQosA imclude files. + +Thu Feb 8 00:17:43 2001 Pradeep Gore <pradeep@cs.wustl.edu> + + * ace/QoS_Decorator.cpp: + * ace/QoS_Session_Factory.cpp: + * ace/SOCK_Dgram_Mcast_QoS.cpp: + * ace/QoS_Decorator.h: + * ace/QoS_Session_Factory.h: + * ace/SOCK_Dgram_Mcast_QoS.h: + * ace/QoS_Manager.cpp: + * ace/QoS_Session_Impl.cpp: + * ace/SOCK_Dgram_Mcast_QoS.i: + * ace/QoS_Manager.h: + * ace/QoS_Session_Impl.h: + * ace/QoS_Session_Impl.i: + Moved the AQoSA classes to ace/QoS directory. + + * ace/Makefile: + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + Removed the QoS related files, added QoS directory to build. + + * ace/Qos/Makefile + * ace/QoS/ACE_QoS.dsw: + * ace/QoS/ACE_QoS.dsp: + * ace/QoS/ACE_QoS_Lib.dsp: + * ace/QoS/ACE_QoS_Export.h: + Added Makefile and MSVC project files. + Thanks to Craig Rodrigues <crodrigu@bbn.com> for suggesting this + change and providing the patch. + +Wed Feb 7 11:34:56 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/Message_Queue_Test_Ex.cpp: + Fix build problems for single threaded environments. + +Wed Feb 7 09:03:22 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptors): Fixed + incorrect if/else branching. Thanks to Lu Yunhai + <luyunhai@huawei.com> for reporting this. + +Tue Feb 6 23:43:49 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * apps/Gateway/Peer/Peer.cpp (await_events): Fixed the use of + %s to be %*s since the string may not be nul terminated! Thanks + to Lu Yunhai <luyunhai@huawei.com> for reporting this. + +Tue Feb 6 20:11:28 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * include/makeinclude/platform_sunos5_sunc++.GNU: + + Remove double inclusion of $(CFLAGS) for Sun CC 5.0. + +Tue Feb 6 19:30:26 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * ace/Malloc_T.cpp (shared_malloc): + Added a #ifdef to remove the warnings from Digital Tru64 cxx. This + is a temporary workaround. TODO: Change ACE_SEH_* macros so that such + hacks are unnecessary. + +Tue Feb 6 19:23:16 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * include/makeinclude/platform_sunos5_sunc++.GNU: + Complete reverting the changes made by Irfan on Sat Jan 27 + 01:06:09 2001. This file was missed in the last revert done by me. + +Tue Feb 06 19:03:35 2001 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_sunos5_sunc++.GNU: For C++ 5, make sure + to add CFLAGS into CCFLAGS, even if no other options are added. Else + things get built without -mt. + +Tue Feb 06 18:37:41 2001 Steve Huston <shuston@riverace.com> + + * tests/Thread_Mutex_Test.cpp: Changed wording of the message for + "timed acquire" not supported so as not to trip the error catcher + in run_tests.pl. + +Tue Feb 06 17:55:28 2001 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/post_completions.cpp: Allow this to + run with AIOCB_Proactor. + + * ace/Asynch_IO.{h cpp}: Added ACE_Handler::handle (ACE_HANDLE) + function to set the handle; changed ACE_HANDLE ACE_Handler::handle + to return the actual value. + + * ace/Asynch_Acceptor.cpp (handle_accept): Call ACE_Handler::handle + to set the handle value for the new handler before calling its + open() method. + +Tue Feb 06 17:16:43 2001 Steve Huston <shuston@riverace.com> + + * tests/MEM_Stream_Test.cpp: + * tests/MEM_Stream_Test.h: New file; moved definition of Echo_Handler + from MEM_Stream_Test.cpp to this file to make it visible to AIX + C++ 3.6.6 at template instantiation time. + +Mon Feb 5 16:19:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/ACE.cpp: ACE_TRACE ("ACE::basename") should be ACE_TRACE ("ACE::diname"). + Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this. + + * ace/Basic_Types.h: Changed the ACE_BIG_ENDIAN and ACE_LITTLE_ENDIAN + macros to use the form 0x0123 rather than 0123X. Thanks to + Craig Rodrigues <crodrigu@bbn.com> for helping find this + problem. + +Mon Feb 5 18:20:11 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * ace/config-sunos5.5.h (ACE_USES_OLD_IOSTREAMS): + + Reverted the change to config-sunos5.5.h and turned on + ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION, + ACE_TEMPLLATES_REQUIRE_SOURCE and ACE_USES_OLD_IOSTREAMS for the + SunCC 5.0 compiler. + +Mon Feb 5 16:19:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * examples/RMCast/Send_File/Receiver.cpp (init): Replaced + a hard-coded file permission of 0644 with + ACE_DEFAULT_FILE_PERMS. Thanks to Chris Kohlhoff + <chris@kohlhoff.com> for reporting this. + +Mon Feb 5 13:00:17 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * tests/Thread_Mutex_Test.cpp: (reported_notsup) + Removed a warning about defined but not used. + +Sat Feb 3 14:41:17 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS.h: + * ace/config-win32-msvc.h: + + Fixed problems with LLSEEK and ACE_stat on Windows CE. + +Sat Feb 3 14:12:36 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/Config_Test.cpp: + * tests/Config_Test.h: + * tests/Log_Msg_Test.cpp: + + Fixed ACE_USES_WCHAR problems. + +Fri Feb 02 18:36:42 2001 Steve Huston <shuston@riverace.com> + + * ace/config-linux-common.h: Added #define ACE_POSIX_AIOCB_PROACTOR + unless the user #defines ACE_POSIX_SIG_PROACTOR before including + config-linux.h. (At least prior to 2.4 kernels) queueing signals + across threads does not work - it fails silently, which breaks + basic functionality of the async model - like asynchronously + accepting TCP connections - and pretty much prevents multi-threaded + work with timers and probably other async operations. + + * examples/Reactor/Proactor/test_proactor.cpp: Disabled the ACE_DEBUG + calls that display message buffers - they're often too large and + overrun the ACE_Log_Msg buffers and crash the program. + +Fri Feb 2 08:38:37 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/WFMO_Reactor.cpp (handler): Set the existing_masks variable to 0 + to avoid warnings from static analysis tools. Thanks to Ivan + Murphy for reporting this. + +Thu Feb 01 22:00:17 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> + + * tests/Message_Queue_Test_Ex.cpp + + Fixed the bugs which were giving runtime error on + Win32 - removed "queue_type" from single_thread_performance_test + and performance_test functions. Now these funtions dont + have args. + + * tests/tests.dsw + + Just an update of the workspace. + +Thu Feb 1 21:00:57 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * bin/auto_compile_win32.pl: + * bin/run_all_list.pm: + + Added TAO RT Mutex unit tests to auto build and test + lists. + +Thu Feb 01 18:52:27 2001 Angelo Corsaro <corsaro@cs.wustl.edu> + + * RTJava: + Added Directory for RTJava related research. Check the + ChangeLog included in the newly directory for more info. + +Thu Feb 01 18:23:17 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> + + * tests/Log_Msg_Test.dsp: + * tests/Config_Test.dsp: + + Added these files. + * tests/tests.dsw: + + Added the above two projects to the workspace. + +Thu Feb 1 18:01:26 2001 Luther J Baker <luther@cs.wustl.edu> + + * ace/OS.i (mutex_init): + + Removed call into PACE. + +Thu Feb 01 18:21:15 2001 Steve Huston <shuston@riverace.com> + + * tests/Thread_Mutex_Test.cpp: Only report "operation not supported" + once for a failed ACE_Thread_Mutex::acquire (ACE_Time_Value &). + Also, if it reports ENOTSUP while ACE_HAS_MUTEX_TIMEOUT is + defined, warns the user that it's probably the wrong setting. + +Thu Feb 01 17:36:28 2001 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/test_proactor3.cpp: Fixed a non-constant + array dimension and some output formatting. + +Thu Feb 01 17:07:35 2001 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/post_completions.cpp: Removed extraneous + 'd' from the 'count' display. + +Thu Feb 01 15:33:26 2001 Steve Huston <shuston@riverace.com> + + * ace/Reactor.h (purge_pending_notifications): + * ace/WFMO_Reactor.h (purge_pending_notifications): + * ace/Select_Reactor_Base.h (purge_pending_notifications): + Removed the default argument value - callers must now explicitly + specify a 0 ACE_Event_Handler* to remove all handler notifications. + Thanks to Edan Ayal <edana@bandwiz.com> for arguing this point. + +Thu Feb 1 09:57:41 2001 Jeff Parsons <parsons@cs.wustl.edu> + + * ace/SString.i: + + Changed behavior of ACE_WString::rep to be the same + as ACE_CString::rep, that is, to return an empty + (w)string rather than a null (w)string when the length + is 0. Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> + for pointing out this discrepancy. + +Thu Feb 1 09:42:41 2001 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_chorus4.x_g++.GNU: + + Modification to allow building for Chorus 4.x on x86. CPU will be + set to x86, but CLX_TYPE will be set to i486-elf-sysv4. + +Thu Feb 01 10:29:31 2001 Steve Huston <shuston@riverace.com> + + * ace/Synch.i (ACE_Null_Mutex::acquire (ACE_Time_Value&)): Removed + the arg name to fix "unused argument" warning from g++. + +Wed Jan 31 22:01:00 2001 Rick Stille <stille_r@ociweb.com> + * ace/OS.cpp(operator FILETIME): Corrected an error in the Jan 26 GHS + revision. The term "ACE_Time_Value::FILETIME_to_timval_skew" had been + omitted from the calculation. + +Wed Jan 31 18:43:26 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): + Removed the warning about queue_type using ACE_UNUSED_ARG. + +Wed Jan 31 17:27:35 2001 Steve Huston <shuston@riverace.com> + + * ace/Acceptor.cpp (ACE_Oneshot_Acceptor::handle_input): Unregister + the acceptor from the reactor before doing the shared_accept call + to guard against the use-case where the acceptor is destroyed during + the service handler activation sequence. + +Wed Jan 31 15:55:23 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * ace/Synch.i: + Added ACE_Null_Mutex::acquire (ACE_Time_Value &tv) + to fix link error. + +Wed Jan 31 15:12:00 2001 Jeff Parsons <parsons@cs.wustl.edu> + + * ace/CDR_Stream.h: + + Made method do_byte_swap() public. If ACE_ENABLE_SWAP_ON_WRITE + is defined, TAO_GIOP_Message_Base::format_message() and + TAO_GIOP_Message_Lite::format_message() both call this method. + Thanks to Paul Rubel <prubel@bbn.com> for reporting this bug. + +Wed Jan 31 12:19:51 2001 Steve Huston <shuston@riverace.com> + + * docs/tutorials/Chap_2/ex03.html, ex04.html: Fixed these example + programs to 1) send the Nul terminators with the strings, + 2) allow enough space on the recv to get it all, 3) return a + value from main. + + * docs/tutorials/Chap_2/Chap_2.zip: Updated the above examples. + +Wed Jan 31 06:43:27 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Message_Queue_T.cpp: Make sure that dequeue_head() returns + the number of items still on the queue. Thanks to Johnny + Willemsen for reporting this. + +Tue Jan 30 21:39:15 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> + + * tests/Log_Msg_Test.cpp: In funtion test_ostream(), removed the + if condition to check if ACE_OS::unlink() succeeds. Also set + the ostream to NULL before calling ACE_ERROR_RETURN(). Thanks + to Mike Curtis <mccurry@my-deja.com> for pointing out problem + caused when ACE_OS::unlink() fails. Thanks to Doug in helping + fix the problem. + +Tue Jan 30 18:04:08 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): + Zap the Win32 and VxWorks-specific code from this function. + Thanks to Sharath for reporting this. + +Tue Jan 30 11:34:26 2001 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/test_aiosig_ace.cpp: Fixed a bunch + of mis-coded ACE_ERROR_RETURNs; added a explicit queued completion, + and disabled the display of buffers that may overrun ACE_Log_Msg's + internal buffers to prevent spurious crashes. + +Tue Jan 30 11:26:42 2001 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/post_completions.cpp: Added a count + to be sure that all expected completions are delivered, and + print error message if not. + +Tue Jan 30 10:47:52 2001 Steve Huston <shuston@riverace.com> + + * ace/Select_Reactor_Base.cpp + (ACE_Select_Reactor_Notify::purge_pending_notifications): + * ace/WFMO_Reactor.cpp + (ACE_WFMO_Reactor_Notify::purge_pending_notifications): Changed + to not purge notifications destined for the reactor only + (notification buffer with 0 handler value). Thanks to Edan + Ayal <edana@bandwiz.com> for this fix. + +Tue Jan 30 01:05:51 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): + Add cases for VxWorks and NT. Thanks to Sharath for reporting + this. + + * ace/OS.h: #define _SC_AIO_MAX to 1 if it's not set by default. + Thanks to Jean-Francois Daune <Daune@IBA.be> for reporting this + fix for VxWorks. + +Mon Jan 20 18:36:41 2001 Steve Huston <shuston@riverace.com> + + * ace/Message_Queue_T.h (ACE_Message_Queue_Ex): Use _USE + rather than _DECL to define the ACE_Message_Queue - fixes + compile error. + +Mon Jan 29 17:29:31 2001 Steve Huston <shuston@riverace.com> + + * ace/Message_Queue_T.{h i cpp}: Corrected a bunch of references + to Message_Queue_Ex's queue_ member to use . rather than -> + and removed the ACE_NEW to allocate it (follow-ups from Doug's + Sun Jan 28 08:32:07 2001 change). Fixed other compile + errors to allow tests/Message_Queue_Test_Ex.cpp to build. + FYI... whomever added this, it probably should have been named + Message_Queue_Ex_Test to conform. + +Mon Jan 29 15:30:27 2001 Steve Huston <shuston@riverace.com> + + * ace/POSIX_Proactor.{h cpp} (ACE_POSIX_SIG_Proactor): Don't + mask/block all signals, just the one(s) being used for this + sig proactor instance. Blocking everything can break other + things, such as debuggers and the ability to kill a program. + Also, don't setup a handler for the signals being blocked/waited + as this is a combination whose behavior is undefined. + +Sun Jan 28 08:39:17 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/Thread_Mutex_Test.cpp: + Fixed use of ACE_TEXT and string concatenation. + +Sun Jan 28 08:03:08 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/tests.dsw: + * tests/Message_Queue_Test_Ex.dsp: + Add NT project files for the new test + +Sun Jan 28 08:32:07 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * netsvcs/lib/Client_Logging_Handler.cpp: Fixed the order in which + the iostream messages are logged so that we don't bomb out when + the VERBOSE option is enabled. Thanks to Craig Rodrigues + <crodrigu@bbn.com> for helping find this problem. + + * ace/Message_Queue_T.h: Make sure the lock() forwarding method + forwards to queue_.lock(). + + * ace/Message_Queue_T.{h,i,cpp}: There's no reason to dynamically + allocate the implementation of ACE_Message_Queue_Ex -- instead + it can be simply an instance of ACE_Message_Queue. + + * ace/Message_Queue_T.h: Make sure that the methods on + ACE_Message_Queue_Ex are properly virtual. Thanks to Kitty for + pointing this out. + +Sat Jan 27 19:40:36 2001 Ossama Othman <ossama@uci.edu> + + * bin/auto_run_tests.lst: + + Added TAO's Portable Interceptor "Service_Context_Manipulation" + test to the list of tests to run. + +Sat Jan 27 19:34:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * tests/Config_Test.{h,cpp}: Fixed the use of "bool," which is + not supported on older compilers. Thanks to Kitty for reporting + this. + +Sat Jan 27 15:22:03 2001 Ossama Othman <ossama@uci.edu> + + * tests/Thread_Mutex_Test.cpp (test): + + Added code that tests mutex timeout functionality. + +Sat Jan 27 15:16:33 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/POSIX_Proactor.h: Replace ACE_Thread_Mutex with ACE_SYNCH_MUTEX + to avoid the need for conditional compilation. + + * ace/SUN_Proactor.h: Don't use ACE_Condition<ACE_Thread_Mutex> + but instead use the ACE_SYNCH_CONDITION, which also avoids the + need to conditionally compile for threaded platforms. + +Sat Jan 27 13:29:51 2001 Ossama Othman <ossama@uci.edu> + + * ace/config-linux.h: + + Declare the pthread_mutex_timedlock() prototype as an + 'extern "C"' function. This fixes an "unresolved symbol" link + error. + +Sat Jan 27 10:39:28 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/nightlybuilds/builds.lst: + Apparently the blank in 'RedHat 7.0' breaks the scoreboard. + +Sat Jan 27 01:06:09 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * include/makeinclude/platform_sunos5_sunc++.GNU: SPRO 5.0 + compiler should be able to support automatic template + instantiation. Also, standard C++ library should be ok. -g was + added to DCCFLAGS. + + * ace/config-sunos5.5.h: Turned off + ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION, + ACE_TEMPLATES_REQUIRE_SOURCE and ACE_USES_OLD_IOSTREAMS for the + SPRO 5.0 compiler. + + Thanks to J. Russell Noseworthy <rnosewor@objectsciences.com> + for contributing the above patches. + +Sat Jan 27 00:37:26 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/OS.i: + + - (mutex_lock): Windows code must use relative time since that + is what WaitForSingleObject() expects. Also, fixed extra + "return" before ACE_NOTSUP_RETURN. + + - (thread_mutex_lock): Made thread_mutex_lock() with timeout + close to the thread_mutex_lock() without timeouts. + +Fri Jan 26 21:53:45 2001 Ossama Othman <ossama@uci.edu> + + * ace/OS.h: + * ace/OS.i (thread_mutex_lock): + + Added an overloaded version of this method that accepts a + timeout argument. It delegates to the standard + ACE_OS::mutex_lock() method on non-Windows platforms. + Otherwise, it returns with an ENOTSUP. + + The addition of this method was necessary to fix a compile + problem related to the ACE_Thread_Mutex class. + + * ace/Synch.i (acquire): + + In ACE_Thread_Mutex::acquire() that accepts a timeout argument, + call the corresponding ACE_OS::thread_mutex_lock() method. This + fixes compile-time error on MS Windows builds due to the fact + that ACE_mutex_t and ACE_thread_mutex_t are different types on + that platform. + +Fri Jan 26 17:31:26 2001 Ossama Othman <ossama@uci.edu> + + * ace/OS.i (mutex_lock): + + Fixed unused argument warnings that occured when compiling for + the single threaded case. + +Fri Jan 26 16:58:03 2001 Ossama Othman <ossama@uci.edu> + + * ace/config-linux.h: + + glibc 2.1.x doesn't have the (very useful) __GLIBC_PREREQ + macro. Use a preprocessor test that doesn't rely on it. + +Fri Jan 26 16:48:06 2001 Ossama Othman <ossama@uci.edu> + + * ace/config-qnx-neutrino.h (ACE_HAS_MUTEX_TIMEOUTS): + * ace/config-qnx-rtp.h (ACE_HAS_MUTEX_TIMEOUTS): + + QNX supports pthread_mutex_timedlock(). Yes! + +Fri Jan 26 17:50:38 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/config-win32-common.h: + ace/config-vxworks-5.x.h: Added ACE_HAS_MUTEX_TIMEOUTS macro. + + * ace/OS.i: Added timed mutex operations for Win32, VxWorks, and + pSoS. + +Fri Jan 26 16:31:15 2001 Ossama Othman <ossama@uci.edu> + + * ace/OS.h (mutex_lock): + + Updated documentation for the version of this method that + accepts a timeout value. + + * ace/OS.i (mutex_lock): + + If the platform does not support timed mutexes, then return with + an ENOTSUP. + + * ace/Process_Mutex.h: + * ace/Process_Mutex.inl (acquire): + + Added version of this method that accepts a timeout value. + +Fri Jan 26 17:50:38 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp (report_stats): + Fixed some unintentional tabs. Thanks to Mike Curtis for + reporting this! + +Fri Jan 26 15:34:01 2001 Ossama Othman <ossama@uci.edu> + + * ace/OS.h: + * ace/OS.i (mutex_timedlock, mutex_lock): + * ace/Synch.i (acquire): + + Renamed the ACE_OS::mutex_timedlock() to the overloaded + ACE_OS::mutex_lock(). + +Fri Jan 26 14:13:32 2001 Ossama Othman <ossama@uci.edu> + + * ace/OS.h: + * ace/OS.i (mutex_timedlock): + + Wrapped the pthread_mutex_timedlock() function. It times out if + a lock hasn't been acquired by the given absolute time. + + * ace/Synch.h: + * ace/Synch.i (acquire): + + Added versions of this method that accept an ACE_Time_Value. + They are used to prevent blocking definitely while waiting for a + given mutex to become available. + + * ace/config-linux.h (ACE_HAS_MUTEX_TIMEOUTS): + + glibc 2.2.x supports the pthread_mutex_timedlock() function. + + * ace/config-linux-common.h: + + Undefine ACE_LACKS_{LLSEEK,LSEEK64}_PROTOTYPE prior to include + the KCC configuration file. Thanks to Jeff Greif + <jgreif@befree.com> for reporting this. + + * ace/README: + + Added ACE_HAS_MUTEX_TIMEOUTS to the list of ACE macros. + +Fri Jan 26 11:18:15 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Log_Msg.cpp (dump): Fixed some unintentional tabs. Thanks + to Mike Curtis for reporting this! + + * ace/SOCK_Dgram_Mcast.cpp (open): Modified the call to + ACE_SOCK_Dgram::shared_open() to just pass in this->mcast_ + rather than making a local copy that just contained the port + number. Thanks to Keith Nicewarner <knicewar@erg.sri.com> for + reporting this. + + * tests/Makefile.bor (TESTS): Added Message_Queue_Test_Ex.cpp. + +Fri Jan 26 13:37:30 2001 Luther J Baker <luther@cs.wustl.edu> + + * ace/OS.h: + + If using PACE, ACE_stat typedefs to pace_stat_s. diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h index 8d9638f4d2e..8c32988eae7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h @@ -19,9 +19,9 @@ // ============================================================================ #include "Connection_Manager.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl index 2495144eff1..06a5ee135b1 100755 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl @@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../../bin'; use PerlACE::Run_Test; -use File::stat; # amount of delay between running the servers @@ -16,15 +15,13 @@ $status = 0; $nsior = PerlACE::LocalFile ("ns.ior"); $testfile = PerlACE::LocalFile ("output"); - -# generate test stream data -$input = PerlACE::generate_test_file("test_input", 102400); +$makefile = PerlACE::LocalFile ("input"); unlink $nsior; $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior"); -$SV = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -s sender -r 10 -f $input"); -$SV1 = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -s sender -r 1 -f $input"); +$SV = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -s sender -r 10"); +$SV1 = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -s sender -r 1"); $RE1 = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -s distributer -r receiver1 -f output1"); $RE2 = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -s distributer -r receiver2 -f output2"); $DI = new PerlACE::Process ("distributer", "-ORBInitRef NameService=file://$nsior -s sender -r distributer"); @@ -37,7 +34,7 @@ $NS->Spawn (); if (PerlACE::waitforfile_timed ($nsior, 10) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } @@ -107,7 +104,7 @@ $NS->Spawn (); if (PerlACE::waitforfile_timed ($nsior, 10) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } @@ -177,7 +174,7 @@ $NS->Spawn (); if (PerlACE::waitforfile_timed ($nsior, 10) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } @@ -234,7 +231,7 @@ if ($nserver != 0) { } unlink $nsior; -unlink $testfile, $input; +unlink $testfile; exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h index b4392ed9a4c..371cf9087fd 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h @@ -19,9 +19,9 @@ // ============================================================================ #include "Connection_Manager.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint { diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/input b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/input new file mode 100644 index 00000000000..b6579cec283 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/input @@ -0,0 +1,995 @@ +#---------------------------------------------------------------------------- +# input,v 1.1 2001/03/27 11:41:00 irfan Exp +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SERVER_OBJS = server.o +CLIENT_OBJS = ftp.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = ftp server +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = server ftp + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# 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.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/ftp.o .obj/ftp.so .shobj/ftp.o .shobj/ftp.so: ftp.cpp ftp.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.inl \ + $(ACE_ROOT)/ace/Stats.i + +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.inl \ + $(ACE_ROOT)/ace/Stats.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h index 539f43b8b43..fdf5eca12f6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h @@ -18,11 +18,11 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl index efe05403c37..e5b712073f8 100755 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl @@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib $ENV{"ACE_ROOT"}.'/bin'; use PerlACE::Run_Test; -use File::stat; # amount of delay between running the servers @@ -17,14 +16,11 @@ $status = 0; $nsior = PerlACE::LocalFile ("ns.ior"); $outfile = PerlACE::LocalFile ("output"); -# generate test stream data -$input = PerlACE::generate_test_file("test_input", 102400); - unlink $nsior; $NS = new PerlACE::Process ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/Naming_Service", "-o $nsior"); $SV = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -f output"); -$CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -f $input -r 2"); +$CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -f input -r 2"); print STDERR "Starting Naming Service\n"; @@ -66,6 +62,6 @@ if ($nserver != 0) { } unlink $nsior; -unlink $output, $input; +unlink $output; exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h index 16a78c88b96..38c4f0fc664 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Sender_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h index 5af3fec6390..666894ccecf 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h @@ -21,9 +21,9 @@ #ifndef CONNECTION_MANAGER_H #define CONNECTION_MANAGER_H -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" #include "tao/PortableServer/PortableServer.h" class Connection_Manager diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index 7c6383e799c..4dbf363f16d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -3,8 +3,8 @@ #include "distributer.h" #include "tao/debug.h" #include "ace/Get_Opt.h" -#include "orbsvcs/AV/Protocol_Factory.h" -#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h" #include "tao/Strategies/advanced_resource.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h index ab6f4753a14..fc9205c72c2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h @@ -19,9 +19,9 @@ // ============================================================================ #include "Connection_Manager.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Signal_Handler : public ACE_Event_Handler { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/input b/TAO/orbsvcs/tests/AVStreams/Component_Switching/input new file mode 100644 index 00000000000..77483aa8712 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/input @@ -0,0 +1,1376 @@ +#---------------------------------------------------------------------------- +# $Id$ +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SENDER_OBJS = sender.o +DISTRIBUTER_OBJS = distributer.o +RECEIVER_OBJS = receiver.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = sender distributer receiver +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = sender distributer receiver + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# 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.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i + +.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h + +.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ +#---------------------------------------------------------------------------- +# $Id$ +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SENDER_OBJS = sender.o +DISTRIBUTER_OBJS = distributer.o +RECEIVER_OBJS = receiver.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = sender distributer receiver +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = sender distributer receiver + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# 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.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h index 19a9c673b8c..1870574ee10 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h @@ -19,9 +19,9 @@ // ============================================================================ #include "Connection_Manager.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Signal_Handler : public ACE_Event_Handler { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl index 386c038f9a0..878b86cc065 100755 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl @@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib $ENV{'ACE_ROOT'}."/bin"; use PerlACE::Run_Test; -use File::stat; # amount of delay between running the servers @@ -18,16 +17,14 @@ $status = 0; $nsior = PerlACE::LocalFile ("ns.ior"); $testfile = PerlACE::LocalFile ("output"); - -# generate test stream data -$input = PerlACE::generate_test_file("test_input", 102400); +$makefile = PerlACE::LocalFile ("input"); unlink $nsior; $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-ORBDottedDecimalAddresses 1 -o $nsior"); -$SV1 = new PerlACE::Process ("sender", "-ORBDottedDecimalAddresses 1 ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30 -f $input"); -$SV2 = new PerlACE::Process ("sender", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30 -f $input"); -$SV3 = new PerlACE::Process ("sender", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30 -f $input"); +$SV1 = new PerlACE::Process ("sender", "-ORBDottedDecimalAddresses 1 ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30"); +$SV2 = new PerlACE::Process ("sender", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30"); +$SV3 = new PerlACE::Process ("sender", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r 30"); $RE1 = new PerlACE::Process ("receiver", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s distributer -r receiver1 -f output1"); $RE2 = new PerlACE::Process ("receiver", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s distributer -r receiver2 -f output2"); $DI1 = new PerlACE::Process ("distributer", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -s sender -r distributer"); @@ -43,7 +40,7 @@ $NS->Spawn (); if (PerlACE::waitforfile_timed ($nsior, 10) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } @@ -154,7 +151,7 @@ if ($nserver != 0) { } unlink $nsior; -unlink $testfile, $input; +unlink $testfile; exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h index 6b5e8ef9e76..5d9d4971e62 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h @@ -19,9 +19,9 @@ // ============================================================================ #include "Connection_Manager.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Signal_Handler : public ACE_Event_Handler { diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp index 6f11e981b6d..1edecfe0c74 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp @@ -120,7 +120,7 @@ Client::parse_args (int argc, break; case 'l': this->address_ = ACE_OS::strdup (opts.opt_arg ()); - l_addr = 1; + l_addr = 1; break; case 'a': this->peer_addr_ = ACE_OS::strdup (opts.opt_arg ()); @@ -145,7 +145,7 @@ Client::parse_args (int argc, address_ = buf; address_ += ":5000"; } - + if (p_addr == 0) { char buf [BUFSIZ]; @@ -154,7 +154,7 @@ Client::parse_args (int argc, peer_addr_ = buf; peer_addr_ += ":5050"; } - + return 0; } @@ -252,11 +252,7 @@ Client::init (int argc,char **argv) { ACE_DEBUG ((LM_DEBUG,"file opened successfully\n")); } - else - { - ACE_ERROR_RETURN ((LM_ERROR, "ERROR: file %s could not be opened\n", - this->filename_), -1); - } + } ACE_CATCHANY { @@ -307,12 +303,12 @@ Client::run (void) CORBA::Boolean result = this->streamctrl_.bind (sep_a_.in(), - sep_b.in(), - the_qos.inout(), - flow_spec + sep_b.in(), + the_qos.inout(), + flow_spec ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + timer.stop (); timer.elapsed_time (elapsed); elapsed.dump (); diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h index 132c98f1af8..b780e067d95 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h @@ -6,12 +6,12 @@ #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Flows_T.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Transport.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Flows_T.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Transport.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" class Client; diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl index 242253d1740..ba31ae468a7 100755 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl @@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../../bin'; use PerlACE::Run_Test; -use File::stat; # amount of delay between running the servers @@ -16,21 +15,20 @@ $status = 0; $nsior = PerlACE::LocalFile ("ns.ior"); $outfile = PerlACE::LocalFile ("output"); +$makefile = PerlACE::LocalFile ("Makefile"); $debug = 0; unlink $nsior; -# generate test stream data -$input = PerlACE::generate_test_file("test_input", 102400); @protocols = ("TCP", "UDP" ); -for ($i = 0; $i <= $#ARGV; $i++) +for ($i = 0; $i <= $#ARGV; $i++) { - if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") + if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { print STDERR "\nusage: run_test\n"; @@ -42,7 +40,7 @@ for ($i = 0; $i <= $#ARGV; $i++) exit; } - elsif ($ARGV[$i] eq "-d") + elsif ($ARGV[$i] eq "-d") { $debug = $ARGV[$i + 1]; $i++; @@ -55,10 +53,10 @@ print STDERR "Starting Naming Service\n"; $NS->Spawn (); -if (PerlACE::waitforfile_timed ($nsior, 10) == -1) +if (PerlACE::waitforfile_timed ($nsior, 10) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } @@ -70,31 +68,31 @@ for $protocol (@protocols) { $output_file = "RTP_output"; } - else { + else { $output_file = $protocol."_output"; } $SV = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -f ".$output_file); - $CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol." -f $input"); - + $CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol." -f $makefile"); + print STDERR "Using ".$protocol."\n"; print STDERR "Starting Server\n"; - + $SV->Spawn (); - + sleep $sleeptime; - + print STDERR "Starting Client\n"; - + $sender = $CL->SpawnWaitKill (200); - + if ($sender != 0) { print STDERR "ERROR: sender returned $sender\n"; $status = 1; } - + $receiver = $SV->TerminateWaitKill (200); - + if ($receiver != 0) { print STDERR "ERROR: receiver returned $receiver\n"; $status = 1; @@ -109,6 +107,6 @@ if ($nserver != 0) { } unlink $nsior; -unlink $output, $input; +unlink $output; exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h index c09769d950c..58bbe6da8a7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h @@ -3,14 +3,14 @@ #include "ace/Get_Opt.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Flows_T.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Transport.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Flows_T.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Transport.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Server; diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp index 02ee69e90a2..f995c2764d0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h" #include "tao/PortableServer/PortableServer.h" #include "tao/Strategies/advanced_resource.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp index 0bed10e783d..07801f4a170 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ping.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" #include "tao/ORB.h" #include "tao/Strategies/advanced_resource.h" #include "ace/Get_Opt.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h index 88e6fc31b97..0567cc3f821 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h @@ -16,9 +16,9 @@ #ifndef TAO_PING_H #define TAO_PING_H -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Policy.h" -#include "orbsvcs/AV/Flows_T.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/Flows_T.h" #include "ace/OS_NS_time.h" class Ping_Recv_Callback : public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index 28ad850add1..6153f46b0e6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp @@ -1,7 +1,7 @@ // $Id$ #include "pong.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" #include "tao/PortableServer/PortableServer.h" #include "tao/Strategies/advanced_resource.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h index 92d90adaad4..c8527c9f6f1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h @@ -16,9 +16,9 @@ #ifndef TAO_PONG_H #define TAO_PONG_H -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Policy.h" -#include "orbsvcs/AV/Flows_T.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/Flows_T.h" class Pong_Recv_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Makefile.am index 616d62b1c76..78c1bdc6b4f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Makefile.am +++ b/TAO/orbsvcs/tests/AVStreams/Makefile.am @@ -1,18 +1,23 @@ +##--------------------------------------------------------------------------- +## $Id$ +## +## Top-level Makefile for TAO's AVStreams Tests +## +##--------------------------------------------------------------------------- + +## ## Process this file with automake to create Makefile.in +## + +## The number in AUTOMAKE_OPTIONS is the minimum required version automake +## needed to process this file. +AUTOMAKE_OPTIONS = 1.4 SUBDIRS = \ - Asynch_Three_Stage \ - Bidirectional_Flows \ - Component_Switching \ - Full_Profile \ - Latency \ - Modify_QoS \ - Multicast \ - Multicast_Full_Profile \ - Multiple_Flows \ - Pluggable \ - Pluggable_Flow_Protocol \ - Simple_Three_Stage \ - Simple_Two_Stage \ - Simple_Two_Stage_With_QoS + benchmark \ + mpeg \ + server_discovery \ + sfp + +EXTRA_DIST = README diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/input b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/input new file mode 100644 index 00000000000..3a38e42d893 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/input @@ -0,0 +1,9047 @@ +Wed Apr 11 20:36:36 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * examples/Synch/proc_sema.cpp (main): Fixd an assigning string + literal to char* warning. + +Wed Apr 11 18:04:33 2001 Steve Huston <shuston@riverace.com> + + * include/makeinclude/rules.bin.GNU: Change the Visual Age C++ + incremental build command to use vacbld_r, the thread-enabled + variant of vacbld. + +Wed Apr 11 11:00:50 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ACE-INSTALL.html: Added a section illustrating how to build + ACE+TAO for RTEMS. Thanks to Joel Sherrill <joel@OARcorp.com> + for this build procedure. + +Wed Apr 11 11:38:37 2001 Steve Huston <shuston@riverace.com> + + * ace/IOStream.h: Reverted change from + Tue Apr 10 18:35:22 2001 Steve Huston <shuston@riverace.com> + and replaced it with a section that sets ACE_LACKS_ACE_IOSTREAM + if ACE_HAS_STANDARD_CPP_LIBRARY is set and ACE_USES_OLD_IOSTREAMS + is not. This restriction is noted and tracked in Bugzilla # 857. + + * ace/IOStream.cpp: + * tests/IOStream_Test.cpp: Reverted change from + Tue Apr 10 18:35:22 2001 Steve Huston <shuston@riverace.com> + +Wed Apr 11 09:44:32 2001 Chad Elliott <elliott_c@ociweb.com> + + * examples/Misc/test_trace.cpp: + + Fixed a strange compiler error with Tornado II. + My_Task::recursive was inline which caused an internal compiler + error. + +Wed Apr 11 08:04:21 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * include/makeinclude/platform_linux.GNU: By default, we build + ACE+TAO with exceptions enabled on Linux. Thanks to Craig + Rodrigues <crodrigu@bbn.com> for motivating this change. + + * ace/SString.i (operator+): Fixed an "inlined before use" warning. + Thanks to Bala for reporting this. + +Tue Apr 10 16:58:54 2001 Ossama Othman <ossama@uci.edu> + + * ace/OS.h (ACE_DEFAULT_FILE_PERMS, ACE_DEFAULT_DIR_PERMS): + + Changed the default values on UNIX from 0666 and 0777 to 0644 + and 0755, i.e. removed global write permissions. This addresses + some security issues. Now, only the owner has write permissions + by default. + +Tue Apr 10 18:35:22 2001 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_sunos5_sunc++.GNU: Added a new + build option, stdcpplib, which defaults to 1. If set to 1, + Sun Workshop 5 and Forte 6 compilers will use the standard + C++ library, including standard iostreams. Set to 0 to + use the old, classic iostreams. + + * include/makeinclude/platform_hpux_aCC.GNU: Added support for + the stdcpplib build option. It defaults to 1 if using aC++ + x.27, or 0 if not. Thanks very much to Istvan Buki <ibuki@fedex.com> + for these changes. + + * ace/config-aix-4.x.h: For Visual Age C++ 5, turn on + ACE_HAS_STANDARD_CPP_LIBRARY and + ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB. + + * ace/config-sunos5.5.h: For Sun Workshop 5 and Forte 6 compilers, + take the ACE_USES_OLD_IOSTREAMS setting from the platform_macros.GNU + file; don't set it here. + + * ace/config-hpux-11.00.h: + * ace/config-hpux-10.x-hpc++.h: If the stdcpplib=1 option was used, + then turn on ACE_HAS_STANDARD_CPP_LIB and + ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB. Else turn on + ACE_USES_OLD_IOSTREAMS. + + * ace/IOStream.{h cpp}: Only try to build this stuff if + ACE_LACKS_ACE_IOSTREAM is not defined and ACE_USES_OLD_IOSTREAMS + _is_ defined. The check on ACE_USES_OLD_IOSTREAMS can be removed + when ACE_IOStream gets ported to standard iostreams. + + * tests/IOStream_Test.cpp: Only try this if ACE_USES_OLD_IOSTREAMS + is defined. Remove this if/when ACE_IOStream is ported to new + iostreams. + +Tue Apr 10 17:51:25 2001 Pradeep Gore <pradeep@cs.wustl.edu> + + * bin/auto_run_tests.lst: + Added TAO/tests/OctetSeq/run_test1{2}.pl to auto testing. + +Tue Apr 10 16:33:42 2001 Joe Hoffert <joeh@cs.wustl.edu> + + * ace/CDR_Stream.i: + * ace/CDR_Stream.cpp: + Added sanity checks for sizes of strings and arrays. + +Tue Apr 10 15:14:52 2001 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_vxworks5.x_g++.GNU: + + Added missing else/endif from previous support addition. + +Tue Apr 10 11:48:51 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * include/makeinclude/platform_vxworks5.x_g++.GNU: Added support + for the M68k line of CPUs. Thanks to Albert Pariante + <albert@sw.bev.etn.com> for reporting this. + +Tue Apr 10 02:14:55 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * bin/PerlACE/Run_Test.pm (check_n_cleanup_files): Added a new + PerlACE function that checks for unwanted files and spits out a + warning before removing the file. It makes sure that we not + only clean up resource leaks but also notice their existence. + + * tests/run_test.pl (delete_temp_files): Used the new + <check_n_cleanup_files> to remove the temp files for + MEM_Stream_Test, if there are any. + +Tue Apr 10 1:44:02 2001 Yamuna Krishnamurthy <yamuna@ace.cs.wustl.edu> + + * examples/QOS/Change_Sender_TSpec/receiver.cpp: + * examples/QOS/Change_Sender_TSpec/receiver.dsp: + * examples/QOS/Change_Sender_TSpec/sender.cpp: + * examples/QOS/Change_Sender_TSpec/sender.dsp: + * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h: + * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp: + * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h: + * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp: + * examples/QOS/Change_Sender_TSpec/QoS_Util.h: + * examples/QOS/Change_Sender_TSpec/QoS_Util.cpp: + * examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h: + * examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.cpp: + * examples/QOS/Change_Sender_TSpec/FlowSpec_Dbase.h: + * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h: + * examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp: + * examples/QOS/Change_Sender_TSpec/README: + * examples/QOS/Change_Sender_TSpec/Makefile: + + Added a test to dynamically change the Sender flow spec in + order to continuously change the PATH messages. + + * examples/QOS/Change_Receiver_FlowSpec/receiver.cpp: + * examples/QOS/Change_Receiver_FlowSpec/receiver.dsp: + * examples/QOS/Change_Receiver_FlowSpec/sender.cpp: + * examples/QOS/Change_Receiver_FlowSpec/sender.dsp: + * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h: + * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp: + * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h: + * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp: + * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h: + * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp: + * examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h: + * examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp: + * examples/QOS/Change_Receiver_FlowSpec/FlowSpec_Dbase.h: + * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h: + * examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp: + * examples/QOS/Change_Receiver_FlowSpec/README: + * examples/QOS/Change_Receiver_FlowSpec/Makefile: + + Added a test to dynamically change the Receiver flow spec in + order to continuously change the RESV messages. + + * examples/QOS/Simple/receiver.cpp: + * examples/QOS/Simple/receiver.dsp: + * examples/QOS/Simple/sender.cpp: + * examples/QOS/Simple/sender.dsp: + * examples/QOS/Simple/Sender_QoS_Event_Handler.h: + * examples/QOS/Simple/Sender_QoS_Event_Handler.cpp: + * examples/QOS/Simple/Receiver_QoS_Event_Handler.h: + * examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp: + * examples/QOS/Simple/QoS_Util.h: + * examples/QOS/Simple/QoS_Util.cpp: + * examples/QOS/Simple/QoS_Signal_Handler.h: + * examples/QOS/Simple/QoS_Signal_Handler.cpp: + * examples/QOS/Simple/FlowSpec_Dbase.h: + * examples/QOS/Simple/Fill_ACE_QoS.h: + * examples/QOS/Simple/Fill_ACE_QoS.cpp: + * examples/QOS/Simple/README: + * examples/QOS/Simple/Makefile: + + Moved the original QOS example to Simple. + + * examples/QOS/Makefile: + * examples/QOS/QOS.dsw: + + Updated the Makefile to compile the constituent tests. + +Mon Apr 9 18:48:02 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * include/makeinclude/Makefile.rtems: Zapped + + export RTEMS_MAKEFILE_PATH=/opt/rtems/sparc-rtems/erc32/ + + so that the environment variable is obtained from the users + environment. Thanks to Joel Sherrill <joel@OARcorp.com> for + this fix. + + * ace/Log_Msg.h: Only define the ACE_ASSERT macro if it's not + already defined. This make it easy for developers to override + this macro in their config.h file. Thanks to Nathalie D'Amours + <nathalie@stentor.com> for motivating this change. + +Mon Apr 9 15:36:04 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/High_Res_Timer.cpp: + Use the 'cpu MHz' line from /proc/cpuinfo in favor of the + 'bogomips' line, because the latter gives the wrong number on + multi-CPU boxes. + +Mon Apr 9 14:37:30 2001 Chad Elliott <elliott_c@ociweb.com> + + * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: + + Removed extraneous template instantiations. + +Mon Apr 09 09:19:37 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/SString.cpp: + Fixed Fuzz error + +Mon Apr 9 08:28:47 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/SString.{h,i,cpp}: Added improved support for ACE_WString: + . The magic number 32 has been changed to ACE_DEFAULT_GROWSIZE. + . ACE_WString only allocates memory when it is needed. + . The grow strategy can be modified by setting the ACE_GROW_LINEAR define. + the string does not double the memory then, but increases the memory by + ACE_DEFAULT_GROWSIZE. + Thanks to Eric Zuur <Eric.Zuur@meco.nl> for contributing these + enhancements. + + * ace/High_Res_Timer.cpp (get_cpuinfo): Added support for the Pentium + III and IV. Thanks to Stephane Pion + <PION_Stephane@stna.dgac.fr> for contributing this fix. + +Mon Apr 9 07:50:08 2001 Chad Elliott <elliott_c@ociweb.com> + + * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: + * examples/IPC_SAP/SOCK_SAP/Makefile: + Fixed a typo in the Makefile and added "CPP-inclient.h" include to + CPP-memclient.cpp. + +Mon Apr 9 07:42:29 2001 Chad Elliott <elliott_c@ociweb.com> + + * ace/Basic_Types.cpp: + Changed format flags from ios::fmtflags to unsigned long. + This typedef is not supported by all platforms. Thanks Carlos + <coryan@uci.edu> for suggesting this change. + +Mon Apr 09 08:08:11 2001 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Timer_Queue_T.h + Declared private copy constructor and assignment operator + for class ACE_Event_Handler_Handle_Timeout_Upcall + +Sun Apr 08 18:55:58 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/DLL_Test.cpp: + Use ACE::ldname() instead of keeping a local function to + decorate the name. + Use the "d" suffix only on MSVC debug builds. + + * tests/Makefile.bor: + * tests/DLL_Test.bor: + New Borland Makefile for the shared library in DLL_Test. Thanks + to Christopher Kohlhoff <chris@kohlhoff.com> for providing the + patches. + + * tests/run_test.pl: + Add ExeSubDir to the path, required in Borland builds to find + the shared libraries created locally. + +Sun Apr 8 13:12:54 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/SString.cpp: Reordered various constructor initializers so + G++ doesn't complain. Thanks to Bala for reporting this. + + * ace/SString.{h,i,cpp}: Added various optimizations to ACE_WString + so it will perform certain operations as efficiently as + ACE_CString. Thanks to Eric Zuur <Eric.Zuur@meco.nl> for + contributing these enhancements. + +Sun Apr 08 12:10:30 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp: + * examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp: + * examples/IPC_SAP/SOCK_SAP/Makefile: Updated obsolete + shared-memory transport functions. + +Sun Apr 8 09:49:26 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * bin: Added a new shell script called "make-components" that enables + each ACE component to be built in a simple manner using the + following change from Arturo. + + * ace/Makefile: Generalized the libACE.a and libACE.$(SOEXT) targets + to simplify subsettings. Thanks to Arturo Montes + <mitosys@colomsat.net.co> for reporting this. + +Sat Apr 7 16:00:48 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * tests: Added a new rtems_init.c file. Thanks to Joel Sherrill + <joel@OARcorp.com> for contributing this port. + + * include/makeinclude: Added the new platform_rtems.x_g++.GNU file. + * ace: Added the new config-rtems.h file. + + * ace/OS.cpp: Added support for RTEMS, which is an open-source + real-time operating system that can be downloaded from + ftp://ftp.oarcorp.com/pub/rtems. Thanks to Joel Sherrill + <joel@OARcorp.com> for contributing this port. + + * ace/OS.cpp: The return type for ACE_OS::readv_emulation() + should have been ssize_t, not int, to be consistent with its + definition in the header file. Thanks to Joel Sherrill + <joel@OARcorp.com> for reporting this. + +Sat Apr 7 21:16:49 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Add the new Crash_On_Write and MT_Timeout tests to the nightly + builds. + +Fri Apr 6 21:02:05 2001 Carlos O'Ryan <coryan@uci.edu> + + * examples/Synch/proc_sema.cpp: + Add missing #include for "ace/Log_Msg.h", on platforms that + define ACE_TEMPLATES_REQUIRE_SOURCE this include is magically + obtained, but this is not the case for SunCC 4.2, and + True64/CXX. + +Fri Apr 06 16:22:24 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/SString.h (ACE_Tokenizer): Updated documentation and added + some examples. Thanks to Jody Hagins <jody@atdesk.com> for + providing the original example. + +Fri Apr 6 17:11:34 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * bin/auto_run_tests.lst: Added the Single_Read test to the + nightly build list. + +Fri Apr 6 14:45:52 2001 Chad Elliott <elliott_c@ociweb.com> + + * ace/Basic_Types.h: + * ace/Basic_Types.cpp: + Changed the as_string() method to avoid using floor() which + required math.h and ACE_CString which caused unnecessary coupling. + +Fri Apr 6 08:34:15 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/make_pretty.pl: + Do no give out warnings for the 'nocompatwarnings' option in + HP-UX. + +Fri Apr 6 08:23:02 2001 Chad Elliott <elliott_c@ociweb.com> + + * ace/Basic_Types.cpp: + * ace/Basic_Types.h: + * tests/Process_Strategy_Test.cpp: + * examples/Connection/misc/Connection_Handler.cpp: + Remove build warnings for platforms that don't support unsigned + long long types and have unsigned char's. + +Fri Apr 6 02:02:01 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/OS.h: + * ace/OS.i: The implementation for process semaphore on platforms + lacking named POSIX semaphores was broken. On these platforms, + semaphores are allocated in MMAP file so they should never be + deleted. Added a flag <new_sema_> to remember if a semaphore + can be deleted (USYNC_THREAD) or not (USYNC_PROCESS). + + * ace/config-sunos5.6.h: According to the man pages, SunOS started + supporting POSIX semaphores from 5.6. Defined ACE_HAS_POSIX_SEM + and ACE_LACKS_NAMED_POSIX_SEM. + +Thu Apr 5 11:23:05 2001 Carlos O'Ryan <coryan@uci.edu> + + * html/index.html: + Add link to the new QoS library documentation. + +Thu Apr 05 03:26:13 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * examples/Makefile: + * examples/Synch/Makefile: + * examples/Synch/README: + * examples/Synch/Synch.dsw: + * examples/Synch/proc_sema.cpp: + * examples/Synch/proc_sema.dsp: Added a new example to play with + process semaphores. + +Thu Apr 05 02:48:51 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_IO.cpp (write): My earlier change was causing the test + to crash. + + * ace/MEM_Stream.h: + * ace/MEM_Stream.i: + * ace/MEM_Stream.cpp: Added a new method to inform the stream to + clean up its resources when closing down. + + * tests/MEM_Stream_Test.cpp (handle_close): Handle_close should + only inform it's peer to destroy the mmap file instead of + removing the file itself. + +Wed Apr 4 16:21:13 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/auto_run_tests.lst: + + Added the ImplRepo tests. + +Wed Apr 4 12:13:52 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_IO.h: Declared ACE_INLINE_FOR_GNUC for + ACE_MT_MEM_IO::Simple_Queue's constructor to eliminate a bogus + warning reported by vxworks' gcc compiler. + +Wed Apr 04 07:47:48 2001 Craig Rodrigues <crodrigu@bbn.com> + + * etc/ace_qos.doxygen: + * bin/generate_doxygen.pl: + Generate doxygen documentation for ACE QoS API + +Tue Apr 03 19:55:26 2001 Steve Huston <shuston@riverace.com> + + * bin/auto_compile: Added a -make_type option - the argument to + the option is the suffix of Makefile to use. Example: + -make_type vac would use Makefile.vac instead of Makefile + when building. + + * bin/make_pretty.pl: Corrected tests for AIX errors/warnings. + + * ace/ace.icp: (new) Visual Age C++ 5 project file for libACE. + + * ace/ace.icc: (new) Visual Age C++ 5 configuration file for + libACE. Replaces ace-dll.icc. It will eventually have the + stuff added to make debug/optimize as well as subsets. + + * ace/ace_vacpp_options.icc: Visual Age C++ file for setting ACE + build options. + + * ace/Makefile.vac: Makefile to build libACE using the Visual + Age C++ 5 incremental compiler. It only has "all" and "realclean" + targets, and uses vacbld_r to do the build. + + * tests/tests.icp: Visual Age C++ 5 Project file for making all the + tests. + + * tests/Makefile.vac: Makefile to drive vacbld_r for Visual Age C++. + + * tests/Config_Test.icc: + * tests/Dirent_Test.icc: + * tests/Logging_Strategy_Test.icc: + * tests/MEM_Stream_Test.icc: + * tests/Message_Queue_Test_Ex.icc: + * tests/OS_Test.icc: + New files for building tests with Visual Age C++. + + * tests/libDLL_Test.icc: Changed to use up-to-date source file. + +Tue Apr 03 13:45:02 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_IO.cpp: Fixed mismatched ACE_TRACE messages. Thanks to + the all mighty fuzzmasterd for reporting this. + +Tue Apr 3 11:40:42 2001 Priyanka Gontla <pgontla@ece.uci.edu> + + * examples/IPC_SAP/SSL_SAP/dummy.pem: + * examples/IPC_SAP/SSL_SAP/key.pem: + The previous certificates expired. So, generated them + again. + +Tue Apr 03 09:30:10 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_IO.cpp (write): Fixed a compilation error for Borland + compiler. Thanks to Johnny Willensen for reporting this. + +Mon Apr 02 23:41:34 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_SAP.cpp: + * ace/MEM_SAP.h: + * ace/MEM_SAP.i: + Generalized the ACE_MEM_SAP class to allocate memory in the new + memory wrapper class ACE_MEM_SAP_Node. + + * ace/MEM_IO.cpp: + * ace/MEM_IO.h: + * ace/MEM_IO.i: + Separated the different signaling mechanisms into a different + class in ACE_MEM_IO so it can determine the "right" signaling + strategy allowed. Currently, we implement the Reactive strategy + (ACE_Reactive_MEM_IO) which uses sockets for signaling and + multithreaded strategy (ACE_MT_MEM_IO) which uses semaphores for + signaling. + + * ace/MEM_Stream.cpp: + Sending an empty buffer over to wake up the "other" end when we + are closing down. + + * ace/MEM_Acceptor.cpp: + * ace/MEM_Acceptor.h: + * ace/MEM_Acceptor.i: + * ace/MEM_Connector.cpp: + * ace/MEM_Connector.h: + * ace/MEM_Connector.i: Added facility to specify the "preferred" + signaling strategy so the acceptor and connector can negociate + and agree on the best signaling mechanism to use. + + * ace/MEM_Stream_Test.h: + * ace/MEM_Stream_Test.cpp: + Added the test for the new MT signaling MEM_Stream transfer. + This part of the test seems to be failing on system that depends + on SysV semaphores (because we need more semaphore than the + system can provide.) + +Mon Apr 2 15:17:13 2001 Chad Elliott <elliott_c@ociweb.com> + + * ace/config-chorus.h: + + Chorus 4.x supports unsigned long long's. + +Mon Apr 2 14:23:31 2001 Craig Rodrigues <crodrigu@bbn.com> + + * ace/Makefile: + only build QoS directory under UNIX if rapi is installed + * ace/QoS/README: + add installation instructions and GQOS/RAPI information + +Mon Apr 2 09:57:31 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/PerlACE/MSProject.pm: + + Made a change to the tao_idl depencency checking. + It was only checking for tao_idl and $(InputName) where + some places we use $(InputPath) instead. + + * ace/config-win32-msvc-5.h: + * ace/config-win32-msvc-6.h: + + Disabled the Inheritance by Dominance informational + warning that MSVC gives. We have cases of this all over + the place, and normally we just disable the warning on + a file by file basis, but now we just do a blanket disable. + +Mon Apr 2 08:45:24 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/nightlybuilds/builds.lst: + Renamed the Debian_Full_WU build, its most important feature is + not that it is at WashU nor that it enables most components. It + is the fact that interceptors are disabled on its configuration. + +Sun Apr 1 17:20:22 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/INET_Addr.h: + + Added /**/ around for the inclusion of inetLib.h, since some + MS compilers pick this up in dependency generation. + + * bin/PerlACE/MSProject.pm: + + Used \Q\E around the library names when matching, otherwise + the backslashes were interpreted as escaping, and weird + unicode errors popped up. + + * bin/pippen.pl: + + Pippen was being case sensitive, so tao.lib was different + than TAO.lib. Changes to store only lowercase. + +Sat Mar 31 10:16:01 2001 Carlos O'Ryan <coryan@uci.edu> + + * ACE-INSTALL.html: + Removed broken link, the web page does not exist anymore. Thanks + to John R. Ashmun <john.ashmun@esca.com> for pointing this out. + This fixes [BUGID:833] + +Fri Mar 30 14:08:18 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * performance-tests/TTCP/C/new-ttcp.cpp: + * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp: + Zapped the gettimeofday() method since it didn't seem to be + used. Also, #include "ace/Log_Msg.h". Thanks to Thomas Groth + <groth.th@nord-com.net> for reporting this. + + * ace/OS.h: Changed all the ACE_DEFAULT_* default ports of the + various services to start with 200xx rather than 100xx to avoid + conflicts on AIX, which apparently hijacks port 10002 for + various things. Thanks to David Sperry + <sperryd@res.raytheon.com> for reporting this. + +Sat Mar 31 02:06:09 2001 Christopher Kohlhoff <chris@kohlhoff.com> + + * ace/config-win32-borland.h: + * include/makeinclude/ace_flags.bor: + Fixed up use of inline functions in DEBUG build. + + * include/makeinclude/ace_flags.bor: + Added macros for the TAO_BiDirGIOP and TAO_TypeCodeFactory + libraries. + +Fri Mar 30 11:17:39 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/fuzz.pl: + Add a couple of TODO entries + + * html/index.html: + Add the Audio/Video Streaming service to the index file. + +Fri Mar 30 11:12:53 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/*/Makefile: + * apps/*/Makefile: + * docs/*/Makefile: + * examples/*/Makefile: + * netsvcs/*/Makefile: + * performance-tests/*/Makefile: + * tests/*/Makefile: + * websvcs/*/Makefile: + * ASNMP/*/Makefile: + Regenerate dependencies. + +Fri Mar 30 08:15:26 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/QoS/QoS_Session.h: + Add #include for ACE_QoS_Export + +Fri Mar 30 07:31:54 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/QoS/QoS_Session.h: + Fixed export macro + +Thu Mar 29 20:14:00 2001 Craig Rodrigues <crodrigu@bbn.com> + + * ace/SOCK.h: + Remove include of QoS_Session.h, since it is not used here. + +Thu Mar 29 19:48:00 2001 Craig Rodrigues <crodrigu@bbn.com> + + * ace/QoS_Session.h: + * ace/QoS/QoS_Manager.h: + * ace/QoS/QoS_Session_Impl.h: + * ace/QoS/QoS_Session_Factory.h: + * examples/QOS/QoS_Signal_Handler.h: + * examples/QOS/Receiver_QoS_Event_Handler.h: + * examples/QOS/client.cpp: + * examples/QOS/QoS_Util.h: + * examples/QOS/Sender_QoS_Event_Handler.h: + * examples/QOS/server.cpp: + * examples/QOS/Makefile: + + Move QoS_Session.h to the ace/QoS directory. + +Thu Mar 29 19:12:38 2001 Steve Huston <shuston@riverace.com> + + * include/makeinclude/rules.lib.GNU: AIX-specific changes to + build shared libraries by making a shared shr.o file and putting + that into an archive. Seems weird, but that's the way AIX does + things. This makes ACE consistent with other AIX software. + + * include/makeinclude/platform_aix4_cset++.GNU: Made some changes + to attempt to work with the new scheme for shared lib creation on + AIX. Did not test it, and don't plan to. The CSet++ compiler is not + supported by IBM any longer, and Riverace is not supporting ACE + with it. If someone out there sends patches for this, I'll put + them in, but this file is going away after ACE 5.2 is released. + All uses of IBM-supported compilers (IBM C/C++ and Visual Age C++ + in batch mode) should be with the platform_aix_ibm.GNU file. + +Thu Mar 29 16:16:07 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/Token.cpp (renew): A conditional expression used an && rather + and ||, which was causing problems with ACE_Token. Thanks to + Carsten Madsen <com@navicon.dk> for reporting this. + + * ace/Message_Queue_T.cpp: If any of the various ACE_Message_Queue_Ex + enqueue*() methods fail then make sure to release the message + blocks! Thanks to Boris Kolpackov <bosk@ipmce.ru> for reporting + this. + +Wed Mar 28 21:39:26 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/NT_Service.h: + + Changed the ACE_NT_SERVICE macros to use ACE_TEXT_* API + calls for those that can take in unicode strings. + + * examples/NT_Service/main.cpp: + + Fixed use of ACE_NT_SERVICE to work with ACE_USES_WCHAR. + + * examples/OS/Process/process.cpp: + * examples/Reactor/WFMO_Reactor/test_directory_changes.cpp: + + Changed some Win32 API calls to use ACE_TEXT_* equivalents. + + * ace/ace_wchar.h: + + Added all the ACE_TEXT_* API macros needed above. + + Thanks to Nick Pratt <npratt@microstrategy.com> for + reporting the first of these errors. + +Wed Mar 28 22:07:03 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * tests/tests.dsw: Fixed project dependencies between DLL_Test and + DLL_Test_Impl. Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> + for reporting this. + +Wed Mar 28 20:33:28 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/ACE.cpp: Further improved the implementation of + handle_ready() by simply calling poll() with the timeout + pointer. Thanks to Przemyslaw Marciniak <pmarciniak@lucent.com> + for reporting this. + +Wed Mar 28 17:45:22 2001 Steve Huston <shuston@riverace.com> + + * bin/make_pretty.pl: Adjust the error detector for IBM C/C++ 3.6.6. + + * ace/Containers_T.cpp: Add #include "ace/Log_Msg.h" so IBM C/C++ + can see ACE_DEBUG when compiling template instantiations. + +Wed Mar 28 16:40:24 2001 Luther Baker <luther@cs.wustl.edu> + + * ace/config-all.h + + Removed ACE_WIN32 support for ACE_HAS_POSIX_SEM just because + ACE_HAS_PACE. This can be defined for ACE_WIN32 after we + write more WIN32 emulation. + + * ace/OS.h + * ace/OS.i + * ace/OS.cpp + + PACE updates. + +Wed Mar 28 11:37:09 2001 Fuzz Master D <brunsch@uci.edu> + + * bin/fuzz.pl: + + There are several instances where fuzz gives false + positives, and the code is impossible to fix without + creating compiler warnings. Example: + + void function (CORBA::Environment &ACE_TRY_ENV) + { + #if FOO + some_other_function (ACE_TRY_ENV); + ACE_CHECK; + #else + ACE_UNUSED_ARG (ACE_TRY_ENV); + #endif + } + + So normally ACE_UNUSED_ARG errors can be fixed by keeping + the CORBA::ENvironment unnamed and removing the ACE_UNUSED_ARG, + but in this case it isn't possible. So fuzz now accepts + an ignore command for single line use. The above can be fixed + by changing to: + + void function (CORBA::Environment &ACE_TRY_ENV) + { + #if FOO + some_other_function (ACE_TRY_ENV); + ACE_CHECK; + #else + ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check + #endif + } + +Tue Mar 28 13:03:07 2001 Chad Elliott <elliott_c@ociweb.com> + + * bin/make_pretty.pl: + Modification to recognize HP's future errors as warnings. + +Wed Mar 28 11:34:54 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * ace/CDR_Base.inl: + Removed memset in ACE_CDR::mb_align when ACE_HAS_PURIFY == + 1, since it was causing some TAO unit tests to break (in + particular, the Portable_Interceptors/Service_Context_Manipulation + test). After running Cubit and a few other tests, Purify didn't + notice any more uninitialized memory accesses. Fixes bug #828. + +Wed Mar 28 11:55:39 2001 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_aix_ibm.GNU: New file, replaces + platform_aix_vacpp.GNU for Visual Age C++ 5. Also replaces + use of platform_aix4_cset++.GNU for IBM C/C++ Compilers 3.6.6. + So, for the supported, IBM-supplied compilers (IBM C/C++ 3.6.6 + and Visual Age C++ 5) use this file. If you want to try to keep + using CSet++ 3.4 or earlier, you can keep using + platform_aix4_cset++.GNU, but it's not tested any longer and + will disappear at the next ACE version. If you want to use + Visual Age C++ 4, you should reconsider, and upgrade to version 5. + + * include/makeinclude/platform_aix_vacpp.GNU: Deleted. + + * netsvcs/lib/TS_Clerk_Handler.h: Moved #include "ace/Connector.h" + to be after #include "ace/SOCK_Connector.h" to fix compile error + on AIX, Visual Age C++ 5. + + * ace/config-aix-4.x.h: Clarified comments that this file is for + Visual Age C++ also. Added ACE_DLL_SUFFIX ".a" to match what + is now generated from platform_aix_ibm.GNU. + + * bin/auto_compile: + * bin/make_pretty.pl: Add detection of compile/link warnings and + errors for AIX using the IBM compilers' code. Ignores the multiply + defined symbol warnings from ld if it's an ACE symbol. + + * docs/ACE-development-process.html: Changed to link to Bugzilla so + it works from anywhere. + +Wed Mar 28 10:13:16 2001 Steve Huston <shuston@riverace.com> + + * ace/Makefile.bor: Don't try to build the SSL directory if + SSL_ROOT is not set. + +Wed Mar 28 08:39:26 2001 Carlos O'Ryan <coryan@uci.edu> + + * etc/tao_av.doxygen: + New configuration file for the AV streaming service. Many + thanks to Craig Rodrigues <crodrigu@bbn.com> for converting that + directory. + + * bin/generate_doxygen.pl: + Add the new configuration file. + +Tue Mar 27 19:54:11 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Disable POA/On_Demand_Loading and POA/Loader for Linux/KCC + builds, because that compiler has problems with destructors + after dynamic loading. + Also add the new Hello test to the nightly regression tests. + +Tue Mar 27 19:43:39 2001 Carlos O'Ryan <coryan@uci.edu> + + * include/makeinclude/platform_linux.GNU: + Add support for Insure++ + + * include/makeinclude/rules.local.GNU: + Add new macro to let developers change the default destination + for the dependencies. + + * include/makeinclude/wrapper_macros.GNU: + Let the user override the default VDIR directory, and define the + default values for the IDL generated code extensions. + + Thanks to Jody Hagins <jody@atdesk.com> for all these + improvements. + +Tue Mar 27 19:15:36 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Unbounded_Queue.h: + Add required #include for Chorus builds. + +Tue Mar 27 15:28:56 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/ACE.cpp (handle_ready): Don't try to dereference through + a NULL timeout pointer! Thanks to Przemyslaw Marciniak + <pmarciniak@lucent.com> for reporting this. + +Tue Mar 27 10:08:44 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Select_Reactor_Base.h: + Add missing #include for builds that define + ACE_HAS_REACTOR_NOTIFICATION_QUEUE. + +Tue Mar 27 05:35:38 2001 Christopher Kohlhoff <chris@kohlhoff.com> + + * include/makeinclude/make_flags.bor: + Prevent PASCAL build by default with BCB5 since it is not required. + Since both VCL and non-VCL applications share a common run-time + library you can simply link your VCL code with a non-PASCAL build + of the ACE+TAO libraries. This behaviour can be overridden by + defining the FORCE_PASCAL flag. + + * include/makeinclude/build_core_exe.bor: + * include/makeinclude/build_core_library.bor: + * include/makeinclude/build_dll.bor: + * include/makeinclude/build_exe.bor: + * include/makeinclude/build_lib.bor: + * include/makeinclude/clean.bor: + Build all executables into a directory below the source directory. + Core executables are then copied to the common bin directory. This + is to allow the test scripts to assume all executables can be + found relative to the source directory. + + * include/makeinclude/recurse.bor: + Removed definition of OBJFILES since Borland make doesn't seem to + support recursive macro expansion. + + * ace/config-win32-borland.h: + * include/makeinclude/ace_flags.bor: + Always explicitly define __ACE_INLINE__, with it defaulting to 1. + This change will allow the same compiler flags to be used in user + applications regardless of whether a debug or non-debug build of + ACE is being used. + +Tue Mar 27 09:48:33 2001 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/ace_flags.bor + Corrected the smartproxies_cflags + + * examples/IPC_SAP + Added new BCB makefiles for these examples + + * ace/Timer_Hash_T.cpp + * ace/Timer_Hash_T.h + * ace/Timer_Heap_T.cpp + * ace/Timer_Heap_T.h + * ace/Timer_List_T.cpp + * ace/Timer_List_T.h + * ace/Timer_Wheel_T.cpp + * ace/Timer_Wheel_T.h + Made the isdone method on the iterator classes constant + + * ace/Timer_Queue_T.h + * ace/Timer_Queue_T.i + Several get methods are now const + Argument of set_timer_value and set_interval is now passed by const reference + + * ace/Unbounded_Set.h + * ace/Unbounded_Set.cpp + * tests/Collection_Test.cpp + Added the ACE_Unbounded_Set_Const_Iterator which can be used + to iterate over an const set + +Mon Mar 26 21:02:24 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/Log_Msg_NT_Event_Log.cpp: + + Fixed a compilation problem with RegSetValueEx when + ACE_USES_WCHAR and UNICODE were defined. Thanks to Nick + Pratt <npratt@microstrategy.com> for reporting this. + + * ace/ace_dll.dsp: + + Unchecked the "separate types" option for debug linking. + Thanks to Nick Pratt for this suggestion also. + +Mon Mar 26 13:00:37 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Node.h: + * ace/Node.cpp: + * ace/Array_Base.h: + * ace/Array_Base.inl: + * ace/Array_Base.cpp: + * ace/Unbounded_Queue.h: + * ace/Unbounded_Queue.inl: + * ace/Unbounded_Queue.cpp: + * ace/Unbounded_Set.h: + * ace/Unbounded_Set.inl: + * ace/Unbounded_Set.cpp: + * ace/Containers_T.h: + * ace/Containers_T.i: + * ace/Containers_T.cpp: + Move several containers to their own file. This reduces the + amount of code that needs to be parsed, improving compilation + time (not to mention the fact that the code becomes more + readable.) + For backwards compatibility the Containers file still includes + the new smaller files. + + * ace/Makefile: + * ace/Makefile.am: + * ace/Makefile.bor: + Add new files to the install rules. + Since they are templates they do not need to be compiled on MSVC + so no changes to the project files are required. + + * ace/ARGV.h: + * ace/ARGV.cpp: + * ace/Future.h: + * ace/Handle_Gobbler.h: + * ace/Local_Name_Space.h: + * ace/Malloc_Base.h: + * ace/Memory_Pool.h: + * ace/Name_Space.h: + * ace/Priority_Reactor.h: + * ace/Remote_Name_Space.h: + * ace/Service_Config.h: + * ace/Signal.cpp: + * ace/Signal.h: + * ace/Stats.h: + * ace/Thread_Manager.h: + * ace/Timeprobe_T.h: + * ace/Timer_Heap_T.h: + * ace/Timer_Queue_Adapters.h: + * ace/TkReactor.cpp: + To reduce compilation and recompilation times we only include + the header file that includes the container used in each case, + instead of the full containers class. + +Fri Mar 23 12:40:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp: Make sure + to delete the Consumer_Dispatch_Set * that we get back from + unbind(). Thanks to the ever vigilant Mike Winter + <mwinter@sonic.net> for reporting this. + +Thu Mar 22 10:18:24 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/SString.h: Make the various data members protected + rather than private so subclasses can access them. Thanks to + Martin Krumpolec <krumpo@pobox.sk> for this suggestion. + + * tests/README: Clarified some things about the tests. + Thanks to Eric Desamore <Eric.Desamore@idtv.bull.net> for + motivating this. + +Mon Mar 26 11:03:22 2001 Balachandran <bala@cs.wustl.edu> + + * ACE version 5.1.14 released. + +Sat Mar 24 07:02:35 2001 Chris Cleeland <cleeland_c@ociweb.com> + + * ace/INET_Addr.i (get_host_addr): Added a const_cast to the + VxWorks-only arm that casts away const on the this ptr so that + inet_ntoa_b can access and fill in the buffer data member that's + used to hold the result from inet_ntoa_b. Thanks to Erik Johannes + <ejohannes@oresis.com> for point this out. + +Fri Mar 23 18:01:05 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * bin/auto_run_tests.lst: Some of the tests cannot be run in + Single threaded configurations. Prevented such tests from + running in the nightly builds. + +Fri Mar 23 16:25:18 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/New_Fail_Test.cpp: Reverted the change from "Fri Mar 23 + 06:34:33 2001 Balachandran Natarajan <bala@cs.wustl.edu>". The + change fails to comipile when exceptions are on. + +Fri Mar 23 08:47:29 2001 Carlos O'Ryan <coryan@uci.edu> + + * apps/Gateway/Gateway/Options.cpp: + Explicitly #include Log_Msg.h, on platforms that do not define + ACE_TEMPLATES_REQUIRE_SOURCE the header file is not implicitly + included. This should fix compilation problems on Tru64/CXX and + SunCC/4.2 + +Fri Mar 23 06:34:33 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/New_Fail_Test.cpp: Fixed a stupid warning in g++, + No_AMI_Messaging builds. Surprising that it showed up only in + this build. + +Thu Mar 22 21:33:37 2001 Chris Cleeland <cleeland_c@ociweb.com> + + * ace/INET_Addr.h: VxWorks' inet_ntoa doesn't behave like most + others, and our use was causing memory leaks. VxWorks prefers + that you use its own inet_ntoa_b, which takes the buffer to fill + as an argument. Thus, for VxWorks, added a data member char buf + of the appropriate length so that get_host_addr can use + inet_ntoa_b to fill that in. + + * ace/INET_Addr.i (get_host_addr): For VxWorks only, changed this + to use the preferred inet_ntoa_b. This eliminate memory leaks + under VxWorks. Thanks to Erik Johannes <ejohannes@oresis.com> for + the suggested fix. + +Wed Mar 21 19:20:02 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * apps/Gateway/Peer/Peer.cpp (nonblk_put): Fixed a compile error + in g++. + +Wed Mar 21 17:28:26 2001 Steve Huston <shuston@riverace.com> + + * ace/Message_Queue.h: + * ace/Message_Queue_T.h: Moved definition of typedef for + ACE_DEFAULT_MESSAGE_QUEUE_TYPE from Message_Queue.h to + Message_Queue_T.h, just after defining ACE_Message_Queue<>. + Fixes the case where Message_Queue_T.h is included first, + it includes Message_Queue.h before ACE_Message_Queue<> is + defined, and that breaks the compile. IBM C/C++ hit this. + +Wed Mar 21 16:42:19 2001 Steve Huston <shuston@riverace.com> + + * bin/auto_compile: Added an option: -notao to ignore the TAO aspects + of the non-configurable things, like looking at the TAO/ChangeLog. + Also, now looks for auto_run_tests.lst in the $BUILD/bin directory, + not the $MODULE/bin directory - this allows some builds to specify + their own lists. + +Wed Mar 21 16:00:56 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + The followings are contributions from Scott Snyder + <snyder@fnal.gov> to make ACE happy on Digital UNIX with KCC + 3.4d. + + * include/makeinclude/platform_tru64_kcc.GNU: + * include/makeinclude/platform_osf1_4.0_kcc.GNU: Added KCCOPTS and + support for tru64 unix. + + * ace/OS.h: On this platform, we ran into problems with sigwait + being a macro. The fix that had been added for this was keyed + on __DECCXX_VER, so it isn't picked up on this platform. + + * ace/Sock_Connect.cpp: Enum_Interface_Test failed on this + platform. The code in Socket_Connect.cpp that implements this + is conditional on `__unix' being defined. However, with this + compiler, we get `unix' and `__unix__' defined, but not + `__unix'. Fixed by testing for `__unix__' too. + + * ace/ACE.cpp: Cache_Conn_Test was failing. It looks like the + code in ACE::out_of_handles doesn't have a case to handle osf1. + +Wed Mar 21 12:08:35 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + The followings are contributions from Scott Snyder + <snyder@fnal.gov> to make ACE happy on IRIX 6.x with KCC 3.4d. + + * include/makeinclude/platform_irix6.x_kcc.GNU: + Disable the following warings and separate common options into + $(KCCOPTS). + + 280: declaration of a member with the same name as its class Get + this from <netinet/in.h>. + + 608: this pragma must immediately precede a declaration or + statement Get this from <ucontext.h>. + + * ace/OS.h: Changed to only request RTLD_GROUP and RTLD_NODELETE + if they are actually available. + + * ace/config-irix6.x-kcc.h: Undefined + ACE_LACKS_PLACEMENT_OPERATOR_DELETE since KCC actually supports it. + + Config_Test was failing because with the default setup, ace + tries to locate the shared memory pool at 0x04000000. But it + turns out that this is the same address at which irix likes to + load the KCC shared library, libKCC.so. So the memory pool ends + up blowing away all the library code. Fixed by shifting the + default base address to 0x05000000 for this configuration. + + OS_Test was failing because on irix, kcc 4.0d miscompiles + memchr_emulation if +K3 optimization is used. I worked around + this by just using the library version of memchr instead: + + * ace/ACE.cpp: Cached_Conn_Test was failing because the code in + ACE::out_of_handles doesn't have a case to handle irix. + + * tests/DLL_Test.cpp: It died trying to run object dtors. Fixed by + turning off the close-on-destruction flag for this test. + +Wed Mar 21 13:33:58 2001 Ossama Othman <ossama@uci.edu> + + * examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp: + + Patched this file so that the example actually works. It now + correctly interacts with the SSL client in this example. Thanks + to Defang Zhou <dzhou@inktomi.com> for contributing the + patch/changes necessary to make it work. + +Wed Mar 21 07:23:15 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * tests/SOCK_Connector_Test.cpp (find_another_host): Make the + test a bit more resilent against errors with gethostbyname(). + Thanks to Lu Yunhai <luyunhai@huawei.com> for this fix. + +Tue Mar 20 17:31:21 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/run_test.lst: + The Logging_Strategy_Test dynamically loads the Logger service + (from netsvcs), therefore it does not work on static builds. + +Tue Mar 20 18:17:24 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/OS.i: Fixed the USYNC_PROCESS arm of CreateMutex() in + ACE_OS::mutex_init() so that it calls + ACE_OS::set_errno_to_last_error(). Thanks to Ram Ben-Yakir + <Ram@bandwiz.com> for reporting this. + +Tue Mar 20 01:33:24 2001 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): + * ace/SSL/SSL_SOCK_Connector.cpp (ssl_connect): + * ace/SSL/SSL_SOCK_Stream.i (send, close): + + Wrap the underlying OpenSSL calls in a do-while(SSL_pending()) + loop. I decided to wrap the SSL_write() calls just in case. + This should fix the last of the non-blocking IO issues in ACE's + SSL wrappers. [Bug 393] + +Tue Mar 20 00:40:43 2001 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_SOCK_Stream.i (recv): + + Fixed non-blocking IO support for this method. It was necessary + to ensure that a full SSL record was read before returning + control to the caller. Note that the send() method doesn't need + modification since OpenSSL always writes a full record before + returning. [Bug 393] + +Mon Mar 19 19:53:34 2001 Carlos O'Ryan <coryan@uci.edu> + + * include/makeinclude/ace_flags.bor: + Define macros for the RT Event Service test library + +Mon Mar 19 16:57:43 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/TP_Reactor.cpp (handle_events): Return value from + handle_events() after the Reactor has been deactivated should be + -1. We just need to remember that as illustrated in + ACE_Reactor::run_reactor_event_loop(), this is not an error: + + if (result == -1 && this->implementation_->deactivated ()) + return 0; + + * tests/Thread_Pool_Reactor_Test.cpp (svr_worker): Changed this + function to call ACE_Reactor::run_reactor_event_loop() instead + of ACE_Reactor::handle_events(). In the previous revision, we + were not handling return values from + ACE_Reactor::handle_events() correctly when + ACE_Reactor::deactivated() had been called. + +Mon Mar 19 09:14:12 2001 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_chorus4.x_g++.GNU: + + Added an output option to the link command. Linking would fail + in cases where the output was specified in another directory. + +Sun Mar 18 22:12:16 2001 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_SOCK_Stream.i (close): + + Commented out debugging output that was inadvertently committed + to the repository. + + Don't bother invalidating the handle. Doing so can potentially + cause some side-effects in the underlying OpenSSL + implementation since setting the handle in the SSL_SOCK_Stream + also causes the OpenSSL SSL_set_fd() function to be called. + + Fixed a socket leak caused by the fact that the handle was + invalidated before the underlying ACE_SOCK_Stream was closed. + +Sun Mar 18 09:46:47 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/New_Fail_Test.cpp: Fixed warnings in g++. + +Sun Mar 18 08:31:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * apps/Gateway/Gateway, + * apps/Gateway/Peer: Added a number of fixes to the Gateway and Peer + applications. Thanks to Lu Yunhai <luyunhai@huawei.com> for + contributing these. + +Sun Mar 18 08:31:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * examples/IPC_SAP/FILE_SAP/client.cpp (main): Added a couple of + casts so that the arguments passed to printf() will match the + format specifier types. + +Sat Mar 17 18:02:28 2001 Steve Huston <shuston@riverace.com> + + * ace/config-aix-4.x.h: Fixed settings for exceptions and + placement delete to be ok for Visual Age C++ 5. + + * include/makeinclude/platform_aix_vacpp.GNU: Basically new, + works with the Visual Age C++ 5 batch mode build on AIX. + + * include/makeinclude/rules.lib.GNU: Added aix_build piece to + the section for linking a shared library. It uses the linker + to generate a shr.o (shared) file, then inserts that into + the library that's being built. This new section is only + used with platform_aix_vacpp.GNU at this point. + +Fri Mar 16 15:07:23 2001 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_Context.h (set_mode): + + Changed the default mode from SSLv3 to SSLv23, i.e. support + SSLv2 and SSLv3 by default. This fixes interoperability + with applications that use Sun's JSSE, which only supports + SSLv2. Thanks to Max Khon <fjoe@newst.net> for providing the + patch. + +Thu Mar 15 17:47:28 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/Log_Msg_Test.cpp: Changed a ERROR message as a DEBUG + message. If it is an error message the scripts that run the + build gets confused. + +Thu Mar 15 17:42:54 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/Logging_Strategy_Test.cpp: Changed the "-s" option in the + test to write the output in to the output generated in the "log" + directory. This is just a hack to make the scoreboard clean. + +Thu Mar 15 15:55:37 2001 Steve Huston <shuston@riverace.com> + + * ace/Message_Queue_T.h: Add #include "ace/Message_Queue.h" so + IBM Visual Age C++ sees ACE_Message_Queue_Base when instantiating + templates. + + * ace/ace-dll.icc: Fixed after being munged in a previous commit. + Also, corrected libACE.a generation and cleanup, and incorporated + fixes from Steve Ige <steve.ige@reuters.com> and Jerry + Odenwelder <jerryo@atl.fundtech.com>. + + * THANKS: Added Steve Ige to the Hall of Fame. + +Thu Mar 15 11:26:35 2001 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_SOCK_Acceptor.i (ACE_SSL_SOCK_Acceptor): + + Make sure the handle is set for the ACE_SSL_SOCK_Acceptor, after + initializing the underlying ACE_SOCK_Acceptor. This ensures + that OpenSSL has the proper handle. Thanks to Greg McCain + <greg.mccain@veritas.com> for suggesting this fix. + + * THANKS: + Added Greg to the hall of the fame. + +Thu Mar 15 05:46:59 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/FILE_Addr.cpp (ACE_FILE_Addr): Make sure to divide the size of + the filename_ by the sizeof (ACE_TCHAR) to handle unicode + correctly. Thanks to the ever vigilant Ivan Murphy for catching + this! + +Wed Mar 14 01:47:10 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * apps/Gateway/Gateway/Makefile: + * apps/Gateway/Peer/Makefile: + * apps/JAWS/server/Makefile: + * apps/gperf/tests/Makefile: + * examples/ASX/CCM_App/Makefile: + * examples/Service_Configurator/IPC-tests/server/Makefile: + * examples/Service_Configurator/Misc/Makefile: + * examples/Timer_Queue/Makefile: + * netsvcs/clients/Naming/Client/Makefile: + * netsvcs/clients/Naming/Dump_Restore/Makefile: Removed + unnecessary 'LIBS += $(ACELIB)'. They were causing link problem + for the latest KCC. compiner. + +Tue Mar 13 20:56:10 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/WFMO_Reactor.cpp (remove_to_be_added_handler_i): + * ace/WFMO_Reactor.cpp (remove_suspended_handler_i): + * ace/WFMO_Reactor.cpp (remove_handler_i): + + If a user tried to (a) remove a "to be suspended handle" from + either the current info set or the to be added set, the handle + was correctly removed but the "to be suspended handle" count was + not reduced; (b) remove a "to be resumed handle" from the + suspended set, the handle was correctly removed but the "to be + resumed handle" count was not reduced. Since the "to be resumed + handle" and the "to be suspended handle" were not adjusted + properly, the reactor kept waking up thinking that changes were + required. Thanks to Lu Yunhai <luyunhai@huawei.com> for + reporting this problem. + + * examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp: Added + an extensive example for regression testing the above use cases. + +Tue Mar 13 15:23:04 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Service_Manager.cpp (list_services): Fixed Unicode bugs. + +Tue Mar 13 15:13:48 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * tests/Logging_Strategy_Test.cpp: Fixed Unicode related bugs. + +Tue Mar 13 10:04:06 2001 Carlos O'Ryan <coryan@uci.edu> + + * performance-tests/TCP/run_test.pl: + Fixed the path to the $ACE_ROOT/bin directory, now the script + runs again. + +Tue Mar 13 06:04:03 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Service_Manager.cpp (list_services): Add an indication of whether + a service is active or paused. Thanks to Mike Curtis for this + improvement. + + * ace/Reactor.h: Clarified that the remove_handler (handle, mask) + method also removes the event handle. Thanks to Pierre Fayolle + <fayolle@enseirb.fr> for reporting this. + + * tests/Logging_Strategy_Test.cpp (get_statistic): Replace struct stat + with ACE_stat. Thanks to Johnny Willemsen for reporting this. + +Tue Mar 13 00:35:35 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/Select_Reactor_T.i (deactivated): Reverted this change + regarding Select_Reactor_T::deactivated(): + + Thu Feb 22 12:28:15 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + Though my change improved correctness of access and change to + the <deactivated_> variable, it had a negative consequence: the + event loop calls Select_Reactor_T::deactivated() before calling + Select_Reactor_T::handle_events() to make sure that the reactor + is not closed yet. Unfortunately, if + Select_Reactor_T::deactivated() has a guard, it will send a null + event waking up the current leader and thus lead to unnecessary + thrashing. For now, I have removed the guard from the + Select_Reactor_T::deactivated() methods. We should revisit this + issue some time again. This fixes bug 816. + +Mon Mar 12 16:30:32 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/Logging_Strategy_Test.cpp (main): Fixed the rest of the + warnings in VxWorks builds. + +Mon Mar 12 16:21:42 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/Logging_Strategy_Test.cpp (main): Fixed a couple of + warnings in VxWorks build. Couple of more warnings are left. + +Mon Mar 12 14:16:03 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Local_Name_Space_T.cpp (create_manager_i): Fixed a compile + error on Win32 Unicode platforms. + +Mon Mar 12 12:12:36 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ACE-INSTALL.html: Also mentioned Windows 2000 explicitly in the + document. Thanks to Rahul Shukla <rshukla@ggn.aithent.com> for + raising the question. + +Mon Mar 12 00:49:24 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * tests/tests.dsw: + * tests/Logging_Strategy_Test.dsp: Added a new dsp file. + +Sun Mar 11 21:00:16 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_compile: + Print out the config.h and platform_macros.GNU files, this is + useful when debugging builds. + +Sun Mar 11 18:41:08 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/CDR_Stream.h: Updated a comment to clarify that the buffer() + method just returns a pointer to the first block in the chain. + Thanks to Johnny Willemsen for pointing this out. + +Sun Mar 11 17:46:45 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Local_Name_Space_T.cpp: Fixed a compiler error on Win32 + Unicode platforms. + +Sun Mar 11 17:28:40 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/QoS/QoS_Session_Impl.cpp (rsvp_callback): <errflags> was unused. + +Sun Mar 11 08:31:05 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * tests/Makefile.bor (NAMES): Added Logging_Strategy_Test. + +Sun Mar 11 07:32:18 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/Logging_Strategy_Test.cpp (order): Fixed a warning in g++ + builds. + +Sat Mar 10 23:15:10 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Fixed name of Crashed_Callback test + +Sat Mar 10 19:28:30 PST 2001 Mayur Deshpande <mayur@ics.uci.edu> + + * include/makeinclude/platform_qnx_rtp_gcc.GNU: + Fixes to enable debugging on QNX without ACE crashing. + Thanks to Andy Olson for the suggestions. + +Sat Mar 10 19:05:38 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/config-win32.h: + + Include config-win32-common.h even on Windows CE. + + * ace/config-win32-msvc-6.h: + + If ACE_ENDTHREADEX is already defined, don't define it. + + * ace/OS_Dirent.h: + + Changed the use of ACE_WINCE to ACE_HAS_WINCE. + + * ace/Service_Manager.cpp: + + Fixed a couple of ACE_TCHAR/ACE_LIB_TEXT problems. + + * ace/ace_wchar.h: + + On Windows CE, #include wtypes.h. + + * ace/ace_dll.vcp: + * ace/ace_os_dll.vcp: + + Redid the output files and directories. Now intermediate + files go into Release/PLATFORM and Debug/PLATFORM (where + PLATFORM = MIPS/ARM/X86EM/SH3/SH4). The *.lib files go + into ../Lib/PLATFORM and the *.dll into ../bin/PLATFORM. + Also, the DLL's were renamed from ace_dll.dll and + ace_os_dll.dll to ace[d].dll and ace_os[d].dll. + + * bin/pippen.pl: + + Changed the environment variables from DEFAULT_COMPILER and + DEFAULT_CONFIGS to PIPPEN_COMPILER and PIPPEN_CONFIGS. Also + used \Q\E for the configs because some of the Windows CE + configs confused the script because they use parentheses. + +Sat Mar 10 16:59:51 2001 Carlos O'Ryan <coryan@uci.edu> + + * ACE-INSTALL.html: + Remove references to the now obsolete config-linux-lxpthreads.h + and platform_linux_lxpthread.GNU + +Sat Mar 10 16:38:22 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/run_test.lst: + Running the Recursive_Mutex_Test on single-threaded builds makes + very little sense. + +Sat Mar 10 16:35:19 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Add new tests: Muxing, Crashed_Callback, Client_Leaks and + Server_Leaks to the nightly runs. + +Sat Mar 10 17:55:53 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * include/makeinclude: Zapped the platform_linux_pthread.GNU, + platform_linux_lxpthread.GNU, and platform_linux_lxpthreads.GNU + files since they are confusing and shouldn't not be used in + favor of platform_linux.GNU. + + * ace: Zapped the config-linux.pthread.h and config-linux-lxpthreads.h + file since they are confusing and shouldn't not be used in favor + of config-linux.h. Thanks to Craig Rodrigues for this + suggestion. + +Sat Mar 10 12:39:16 2001 Craig Rodrigues <crodrigu@bbn.com> + + * ace/Reactor.h: + * ace/WFMO_Reactor.h: + * ace/Select_Reactor_T.h: + * ace/Reactor_Impl.h: + Cleaned up comment for schedule_timer() + +Sat Mar 10 07:05:16 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * tests: Added Logging_Strategy_Test.cpp. Thanks to Orlando + Ribeiro <oribeiro@inescporto.pt> for contributing this. + + * tests/Makefile (BIN): Added Logging_Strategy_Test. + + * tests/run_test.lst: Added Log_Msg_Test and + the new Logging_Strategy_Test. + + * tests/Log_Msg_Test.cpp: Added ACE_TEXT macros to all the ACE_DEBUG and + ACE_ERROR calls. + + * ace/Service_Manager.{h,cpp}: Refactored the request processing + code so that it's in a single place. Also, added support to + enable remote reconfiguration. Thanks to Mike Curtis + <mccurry@my-deja.com> for contributing this. + + * ace/Logging_Strategy.cpp (parse_args): Fixed a mistaken + re-initialization of the thread_priority_mask_ and the + process_priority_mask_. Thanks to Martin Krumpolec + <krumpo@pobox.sk> for reporting this. + + * ace/Local_Name_Space_T.cpp (create_manager_i): Fixed this code so that + it doesn't fail if run on a directory that doesn't support locks + (like some NFS mounts). Thanks to scott snyder + <snyder@fnal.gov> for reporting this. + + * tests/SOCK_Connector_Test.cpp: Split up a loop so that the test + doesn't hang on RedHat Linux 7.0. Thanks to Michael Searles + <msearles@base16.com> for this fix. + +Fri Mar 9 22:39:28 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Svc_Conf.h: + * ace/Service_Config.h: + * ace/Service_Config.cpp: + Add new method to the Service Configurator to add static + services into the repository, this factors out common code used + in the ORB and ACE. In general it fixes the hacks done this + past Feb 20th + +Fri Mar 9 16:47:15 2001 Priyanka Gontla <pgontla@ece.uci.edu> + + * bin/nightlybuilds/builds.lst (LIST): + Added HPUX to the scoreboard. + +Fri Mar 9 14:34:34 2001 Chad Elliott <elliott_c@ociweb.com> + + * PACE/Makefile: + * apps/drwho/Makefile: + * bin/PerlACE/Process_Unix.pm: + * include/makeinclude/platform_chorus4.x_g++.GNU: + + Modifications to make things build and run correctly with + Chorus 4.0.1. + +Thu Mar 8 08:38:01 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + The Single_Threaded_POA test cannot run with minimum CORBA or + (isn't this ironic) on single threaded configurations. + +Wed Mar 07 20:25:51 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/nightlybuilds/builds.lst: + Add QNX to the configurations in the scoreboard. + +Wed Mar 7 12:41:05 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Select_Reactor_T.h, + * ace/Reactor_Impl.h, + * ace/WFMO_Reactor.h, + * ace/Reactor.h: Updated the comments to be more accurate. Thanks + to Craig Rodrigues for reporting this. + +Wed Mar 7 08:57:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/Asynch_IO.h: + Changed use of ACE_UNIMPLEMENTED_FUNC to just defining the + assignment operators outright. The point here is to just + provide any implementation, since the default one is flagged as + causing infinite recursion. + + Thanks to David Levine for pointing out this incorrect usage of + the macro. + + * ace/config-win32-msvc-5.h: + * ace/config-win32-msvc-6.h: + + @file comments were mismatched. + + * ace/config-win32.h: + + Changed config-win32-wince.h to config-WinCE.h. + + * ace/ace_wchar.h: + * ace/Log_Msg_NT_Event_Log.cpp: + + Changed several system calls to ACE_TEXT_* (and needed to + add some to ace_wchar.h) since they need the ACE_TEXT + treatment. + +Wed Mar 7 08:20:01 2001 Chad Elliott <elliott_c@ociweb.com> + + * ace/ARGV.cpp: + + Removed a warning about possible use of uninitialized variable. + + * bin/ace_ld: + + Added new functionality to filter out the harmless symbol size + change warnings for VxWorks 5.4. + + * examples/Shared_Malloc/test_multiple_mallocs.cpp: + * examples/Shared_Malloc/test_persistence.cpp: + * examples/Shared_Malloc/test_position_independent_malloc.cpp: + + Renamed the typedef MALLOC to TEST_MALLOC. A MALLOC macro is + defined by a VxWorks system header. + +Wed Mar 7 06:11:52 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Asynch_IO.h: Removed the unnecessary/improper ';' at the + end of the line. Thanks to Johnny Willemsen and Chris Kohlhoff + for reporting/fixing this. + + * ace/*_Connector.h: Clarified in the comments that the + ACE_Time_Value *timeout represents the *maximum* amount of time + to wait. If the server is not running, however, connect() can + return much sooner. Thanks to Dipti Jain <dijain@hss.hns.com> + for motivating this. + +Tue Mar 6 14:14:06 2001 Darrell Brunsch <brunsch@uci.edu> + + Here are some fixes for MSVC 7 beta. Note that no project files + are checked in. Right now they will have to be generated from + the MSVC 5/6 files (The devenv.exe will do this automatically). + When MSVC 7 becomes released, we'll probably have to deal with + including their files (even if only for nightly builds). + + * ace/OS.h: + * ace/config-win32-msvc.h: + + Moved the inclusion of the crtdbg.h file to where it is being + used. This is mainly to alleviate some excessive inclusions. + + * ace/config-WinCE.h: + * ace/config-win32.h: + * ace/config-win32-msvc-5.h: (added) + * ace/config-win32-msvc-6.h: (added) + * ace/config-win32-msvc-7.h: (added) + * ace/config-win32-borland.h: + * ace/config-win32-common.h: + * ace/config-win32-ghs.h: + * ace/config-win32-msvc.h: + * ace/config-win32-visualage.h: + + Added a new config-win32-msvc-7.h with some new settings. While + doing this I also rearranged the files a bit. Everything now + goes through config-win32.h (and an error will occur if you + include the others directly). + + * ace/config-hpux-10.x-hpc++.h: + * ace/config-hpux-11.00.h: + * ace/config-win32-msvc-5.h: + * ace/config-win32-msvc-6.h: + * ace/README: + + Removed ACE_HAS_ONE_DEFINITION_RULE. Could not find this + actually used anywhere so I'm assuming it can be safely + removed. + + * ace/Asynch_IO.h: + + Added some dummy assignment operators. It seems that the default + ones produce infinite recursion (at least with MSVC 6 SP5 and + MSVC 7 beta) + + * ace/Future.h: + + Future_Holder needs to be ACE_Export-ed. + +Tue Mar 6 16:58:17 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/ACE.cpp (format_hexdump): The format_hexdump () was missing + a space if the remaining message that needs dumping was less + than 16 bytes. Thansk to Johnny Willemsen" + <johnny.willemsen@meco.nl> for giving this fix. + +Tue Mar 6 11:25:53 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/PerlACE/Process_Unix.pm: + Ignore SIGABRT too, because it is used by abort() and we call + that function to test the ORB under fault conditions. + +Tue Mar 6 12:25:34 2001 Chad Elliott <elliott_c@ociweb.com> + + * configure.in: + + The configure script was broken on major releases (i.e. those with + no beta numbers). A test for an empty string should have double + quotes around the variable. + +Tue Mar 6 10:16:31 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/config-win32-common.h: + Removed old comment about ACE_HAS_WINSOCK2 being related to + ACE_HAS_WINNT4. Thanks to Johnny Willemsen + <jwillemsen@remedy.nl> for pointing this out. + +Tue Mar 6 10:13:03 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/RMCast/RMCast_Fragment_Test.cpp: + * tests/RMCast/RMCast_Membership_Test.cpp: + * tests/RMCast/RMCast_Reassembly_Test.cpp: + * tests/RMCast/RMCast_Reordering_Test.cpp: + * tests/RMCast/RMCast_Retransmission_Test.cpp: + Use ACE_OS::time(0) to initialize the pseudo-random numbers + seed. It is good enough for our purposes, and it works on + platforms without 64-bit integer support. + +Mon Mar 5 13:56:33 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Synch_T.{h,i}: Further simplified the new ACE_Guard constructor. + Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing + this. + +Mon Mar 5 19:20:45 2001 Fuzz Master D <brunsch@uci.edu> + + * bin/fuzz.pl: + As Ossama pointed out, the ACE_CHECK test was seeing + problems in the tao_idl files since it has uses of ACE_TRY_ENV + inside quotes. Made sure not to detect problems in this case. + +Mon Mar 5 18:58:32 2001 Fuzz Master D <brunsch@uci.edu> + + * bin/fuzz.pl: + Fixed some false positives in the resolve_initial_reference + test and also added an ACE_CHECK test by Carlos's request. + +Mon Mar 5 18:54:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/PerlACE/Process_Unix.pm: + Updated the signal detection to not pay attention to TERM and + KILL. Will print out better output when signals cause a process + to exit during most calls like Kill () or TerminateWaitKill (). + +Mon Mar 5 13:56:33 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Synch_T.{h,i}: Added a new ACE_Guard constructor that + allows the caller to select whether the guard owns/acquires the + lock or not. Thanks to Chris Kohlhoff <chris@kohlhoff.com> for + contributing this. + + * ace/Synch_T.{h,i}: Added a disown() method that relinquishes + ownership of the lock so that it is not released implicitly in + the destructor. Thanks to Chris Kohlhoff <chris@kohlhoff.com> + for contributing this. + + * ace/Event_Handler.h: Updated the comment on handle_close() so that + it more accurately reflects what is going on. Thanks to Defang + Zhou <dzhou@inktomi.com> for suggesting this. + + * apps/Gateway/Gateway/Concrete_Connection_Handlers.{h,cpp}: Added + handle_close() operations to solve problems with certain + concurrency models. Thanks to Defang Zhou <dzhou@inktomi.com> + for reporting this. + +Mon Mar 5 11:29:36 2001 Carlos O'Ryan <coryan@uci.edu> + + * docs/ACE-categories.html: + Fixed links to the doxygen files. + + * ace/Pipe.cpp: + Fixed what looks like a typo, we want to *disable* the stream + pipes under QNX, not to enable them just on that platform. + +Mon Mar 5 08:20:21 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/RMCast/RMCast_Fragment_Test.cpp: + * tests/RMCast/RMCast_Reassembly_Test.cpp: + Undo Doug's changes. They broke the test. + +Mon Mar 5 07:52:52 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Log_Record.cpp (priority): Clarified the behavior of the + priority() set/get methods. Thanks to Christian Schuhegger + <Christian.Schuhegger@cern.ch> for reporting this. + + * tests/RMCast/RMCast_Fragment_Test.cpp, + * tests/RMCast/RMCast_Reassembly_Test.cpp, + * tests/Dynamic_Priority_Test.cpp, + * tests/Thread_Pool_Test.cpp: Make sure to write into the + wr_ptr() rather than the rd_ptr(). Thanks to Gonzalo Diethelm + <Gonzalo.Diethelm@sonda.com> for reporting this. + +Mon Mar 5 08:00:23 2001 Chad Elliott <elliott_c@ociweb.com> + + * bin/nightlybuilds/builds.lst: + + Added new VxWorks 5.4 and Chorus 4.0.1 nightly builds. + +Mon Mar 05 00:10:15 2001 Ossama Othman <ossama@uci.edu> + + * bin/fuzz.pl: + + Updated to detect missing ACE_TRY_ENV parameters in + ORB::resolve_initial_references() calls when emulated exceptions + are used. Thanks to Darrell for providing this update. + +Mon Mar 5 07:57:07 2001 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Makefile.bor: + + Added missing Refcounted_Auto_Ptr_Test to the build + +Sun Mar 4 19:31:16 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/auto_run_tests.lst: + + Added the run_test_mt.pl for Leader_Follers. + + * bin/PerlACE/Process_Unix.pm: + * bin/PerlACE/Process_Win32.pm: + + Added a destructor to detect if a process wasn't explicitly + killed before the object went out of scope. Will print out + an error and kill it. + + * bin/PerlACE/Run_Test.pm: + + Turned on autoflush for all scripts. + + * docs/run_test.txt: + + Updated run_test.pl instructions to fit all the changes I + just made. + + * examples/Export/run_test.pl: + * performance-tests/RPC/run_test.pl: + * performance-tests/TCP/run_test.pl: + * performance-tests/UDP/run_test.pl: + + Updated to use PerlACE::Run_Test; + + * tests/Atomic_Op_Test.dsp: + * tests/Auto_IncDec_Test.dsp: + * tests/Barrier_Test.dsp: + * tests/Basic_Types_Test.dsp: + * tests/Buffer_Stream_Test.dsp: + * tests/CDR_Array_Test.dsp: + * tests/CDR_File_Test.dsp: + * tests/CDR_Test.dsp: + * tests/Cache_Map_Manager_Test.dsp: + * tests/Cached_Accept_Conn_Test.dsp: + * tests/Cached_Conn_Test.dsp: + * tests/Capabilities_Test.dsp: + * tests/Collection_Test.dsp: + * tests/Config_Test.dsp: + * tests/Conn_Test.dsp: + * tests/DLL_Test.dsp: + * tests/DLList_Test.dsp: + * tests/Dirent_Test.dsp: + * tests/Dynamic_Priority_Test.dsp: + * tests/Enum_Interfaces_Test.dsp: + * tests/Env_Value_Test.dsp: + * tests/Future_Set_Test.dsp: + * tests/Future_Test.dsp: + * tests/Handle_Set_Test.dsp: + * tests/Hash_Map_Bucket_Iterator_Test.dsp: + * tests/Hash_Map_Manager_Test.dsp: + * tests/High_Res_Timer_Test.dsp: + * tests/IOStream_Test.dsp: + * tests/Lazy_Map_Manager_Test.dsp: + * tests/Log_Msg_Test.dsp: + * tests/MEM_Stream_Test.dsp: + * tests/MM_Shared_Memory_Test.dsp: + * tests/MT_Reactor_Timer_Test.dsp: + * tests/MT_SOCK_Test.dsp: + * tests/Malloc_Test.dsp: + * tests/Map_Manager_Test.dsp: + * tests/Map_Test.dsp: + * tests/Mem_Map_Test.dsp: + * tests/Message_Block_Test.dsp: + * tests/Message_Queue_Notifications_Test.dsp: + * tests/Message_Queue_Test.dsp: + * tests/Message_Queue_Test_Ex.dsp: + * tests/Naming_Test.dsp: + * tests/New_Fail_Test.dsp: + * tests/Notify_Performance_Test.dsp: + * tests/OS_Test.dsp: + * tests/Object_Manager_Test.dsp: + * tests/OrdMultiSet_Test.dsp: + * tests/Pipe_Test.dsp: + * tests/Priority_Buffer_Test.dsp: + * tests/Priority_Reactor_Test.dsp: + * tests/Priority_Task_Test.dsp: + * tests/Process_Manager_Test.dsp: + * tests/Process_Mutex_Test.dsp: + * tests/Process_Strategy_Test.dsp: + * tests/RB_Tree_Test.dsp: + * tests/Reactor_Exceptions_Test.dsp: + * tests/Reactor_Notify_Test.dsp: + * tests/Reactor_Performance_Test.dsp: + * tests/Reactor_Timer_Test.dsp: + * tests/Reactors_Test.dsp: + * tests/Reader_Writer_Test.dsp: + * tests/Recursive_Mutex_Test.dsp: + * tests/Refcounted_Auto_Ptr_Test.dsp: + * tests/Reverse_Lock_Test.dsp: + * tests/SOCK_Connector_Test.dsp: + * tests/SOCK_Send_Recv_Test.dsp: + * tests/SOCK_Test.dsp: + * tests/SPIPE_Test.dsp: + * tests/SString_Test.dsp: + * tests/SV_Shared_Memory_Test.dsp: + * tests/Semaphore_Test.dsp: + * tests/Service_Config_Test.dsp: + * tests/Sigset_Ops_Test.dsp: + * tests/Simple_Message_Block_Test.dsp: + * tests/Svc_Handler_Test.dsp: + * tests/TSS_Test.dsp: + * tests/Task_Test.dsp: + * tests/Thread_Manager_Test.dsp: + * tests/Thread_Mutex_Test.dsp: + * tests/Thread_Pool_Reactor_Test.dsp: + * tests/Thread_Pool_Test.dsp: + * tests/Time_Service_Test.dsp: + * tests/Time_Value_Test.dsp: + * tests/Timeprobe_Test.dsp: + * tests/Timer_Queue_Test.dsp: + * tests/Tokens_Test.dsp: + * tests/UPIPE_SAP_Test.dsp: + * tests/Upgradable_RW_Test.dsp: + * tests/version_tests/Atomic_Op_Test.dsp: (removed) + * tests/version_tests/Auto_IncDec_Test.dsp: (removed) + * tests/version_tests/Barrier_Test.dsp: (removed) + * tests/version_tests/Basic_Types_Test.dsp: (removed) + * tests/version_tests/Buffer_Stream_Test.dsp: (removed) + * tests/version_tests/CDR_Array_Test.dsp: (removed) + * tests/version_tests/CDR_File_Test.dsp: (removed) + * tests/version_tests/CDR_Test.dsp: (removed) + * tests/version_tests/Cache_Map_Manager_Test.dsp: (removed) + * tests/version_tests/Cached_Accept_Conn_Test.dsp: (removed) + * tests/version_tests/Cached_Conn_Test.dsp: (removed) + * tests/version_tests/Capabilities_Test.dsp: (removed) + * tests/version_tests/Collection_Test.dsp: (removed) + * tests/version_tests/Config_Test.dsp: (removed) + * tests/version_tests/Conn_Test.dsp: (removed) + * tests/version_tests/DLL_Test.dsp: (removed) + * tests/version_tests/DLList_Test.dsp: (removed) + * tests/version_tests/Dirent_Test.dsp: (removed) + * tests/version_tests/Dynamic_Priority_Test.dsp: (removed) + * tests/version_tests/Enum_Interfaces_Test.dsp: (removed) + * tests/version_tests/Env_Value_Test.dsp: (removed) + * tests/version_tests/Future_Set_Test.dsp: (removed) + * tests/version_tests/Future_Test.dsp: (removed) + * tests/version_tests/Handle_Set_Test.dsp: (removed) + * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: (removed) + * tests/version_tests/Hash_Map_Manager_Test.dsp: (removed) + * tests/version_tests/High_Res_Timer_Test.dsp: (removed) + * tests/version_tests/IOStream_Test.dsp: (removed) + * tests/version_tests/Lazy_Map_Manager_Test.dsp: (removed) + * tests/version_tests/Log_Msg_Test.dsp: (removed) + * tests/version_tests/MEM_Stream_Test.dsp: (removed) + * tests/version_tests/MM_Shared_Memory_Test.dsp: (removed) + * tests/version_tests/MT_Reactor_Timer_Test.dsp: (removed) + * tests/version_tests/MT_SOCK_Test.dsp: (removed) + * tests/version_tests/Malloc_Test.dsp: (removed) + * tests/version_tests/Map_Manager_Test.dsp: (removed) + * tests/version_tests/Map_Test.dsp: (removed) + * tests/version_tests/Mem_Map_Test.dsp: (removed) + * tests/version_tests/Message_Block_Test.dsp: (removed) + * tests/version_tests/Message_Queue_Notifications_Test.dsp: (removed) + * tests/version_tests/Message_Queue_Test.dsp: (removed) + * tests/version_tests/Message_Queue_Test_Ex.dsp: (removed) + * tests/version_tests/Naming_Test.dsp: (removed) + * tests/version_tests/New_Fail_Test.dsp: (removed) + * tests/version_tests/Notify_Performance_Test.dsp: (removed) + * tests/version_tests/OS_Test.dsp: (removed) + * tests/version_tests/Object_Manager_Test.dsp: (removed) + * tests/version_tests/OrdMultiSet_Test.dsp: (removed) + * tests/version_tests/Pipe_Test.dsp: (removed) + * tests/version_tests/Priority_Buffer_Test.dsp: (removed) + * tests/version_tests/Priority_Reactor_Test.dsp: (removed) + * tests/version_tests/Priority_Task_Test.dsp: (removed) + * tests/version_tests/Process_Manager_Test.dsp: (removed) + * tests/version_tests/Process_Mutex_Test.dsp: (removed) + * tests/version_tests/Process_Strategy_Test.dsp: (removed) + * tests/version_tests/RB_Tree_Test.dsp: (removed) + * tests/version_tests/Reactor_Exceptions_Test.dsp: (removed) + * tests/version_tests/Reactor_Notify_Test.dsp: (removed) + * tests/version_tests/Reactor_Performance_Test.dsp: (removed) + * tests/version_tests/Reactor_Timer_Test.dsp: (removed) + * tests/version_tests/Reactors_Test.dsp: (removed) + * tests/version_tests/Reader_Writer_Test.dsp: (removed) + * tests/version_tests/Recursive_Mutex_Test.dsp: (removed) + * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (removed) + * tests/version_tests/Reverse_Lock_Test.dsp: (removed) + * tests/version_tests/SOCK_Connector_Test.dsp: (removed) + * tests/version_tests/SOCK_Send_Recv_Test.dsp: (removed) + * tests/version_tests/SOCK_Test.dsp: (removed) + * tests/version_tests/SPIPE_Test.dsp: (removed) + * tests/version_tests/SString_Test.dsp: (removed) + * tests/version_tests/SV_Shared_Memory_Test.dsp: (removed) + * tests/version_tests/Semaphore_Test.dsp: (removed) + * tests/version_tests/Service_Config_Test.dsp: (removed) + * tests/version_tests/Sigset_Ops_Test.dsp: (removed) + * tests/version_tests/Simple_Message_Block_Test.dsp: (removed) + * tests/version_tests/Svc_Handler_Test.dsp: (removed) + * tests/version_tests/TSS_Test.dsp: (removed) + * tests/version_tests/Task_Test.dsp: (removed) + * tests/version_tests/Thread_Manager_Test.dsp: (removed) + * tests/version_tests/Thread_Mutex_Test.dsp: (removed) + * tests/version_tests/Thread_Pool_Reactor_Test.dsp: (removed) + * tests/version_tests/Thread_Pool_Test.dsp: (removed) + * tests/version_tests/Time_Service_Test.dsp: (removed) + * tests/version_tests/Time_Value_Test.dsp: (removed) + * tests/version_tests/Timeprobe_Test.dsp: (removed) + * tests/version_tests/Timer_Queue_Test.dsp: (removed) + * tests/version_tests/Tokens_Test.dsp: (removed) + * tests/version_tests/UPIPE_SAP_Test.dsp: (removed) + * tests/version_tests/Upgradable_RW_Test.dsp: (removed) + * tests/version_tests/run_all_tests.bat: (removed) + * tests/version_tests/version_tests.dsw: (removed) + + Moved the version_tests back into the tests/*.dsp files. The + reason they were originally moved is because it was easier to + select all the debug versions during a batch build. But now we + have pippen.pl and msvc_auto_compile.pl, so this is no longer an + issue, while this strange setup would compilicate the nightly + builds. Thus, it was standardized back. + + * bin/create_vt_dsps.pl: (removed) + + No need for this anymore. + +Sun Mar 4 19:27:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/Log_Msg.cpp: + * ace/Log_Msg_NT_Event_Log.h: + * ace/OS.cpp: + + Disabled Log_Msg_NT_Event_Log on Windows CE. + +Sun Mar 04 13:19:35 2001 Carlos O'Ryan <coryan@uci.edu> + + * etc/tao.doxygen: + Add .txt files, so we can add web pages to the basic TAO + documentation. + +Sun Mar 04 10:58:08 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: Added Log_Msg_NT_Event_Log.{h,cpp} to NT + project files. + +Sun Mar 4 10:41:57 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Log_Msg.cpp, + ace/Log_Msg.h, + ace/Logging_Strategy.cpp, + ace/Makefile.bor, + ace/OS.cpp, + ace/OS.h, + ace/OS.i, + ace/ace.rc: Added support for the new NT event logging capability. + Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing this. + + * ace/Log_Msg_NT_Event_Log.cpp + ace/Log_Msg_NT_Event_Log.h + ace/ace_message_table.bin: Added these files to support the new + NT event logging capability. + Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing + this. + +Sun Mar 4 04:46:44 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/nightlybuilds/builds.lst: + + Added new Windows CE nightly build. + +Sun Mar 04 03:12:17 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * bin/generate_export_file.pl: ACE_AS_STATIC_LIBS was incorrectly + typed in as ACE_STATIC_LIBS. + + * ace/svc_export.h: + * ace/RMCast/RMCast_Export.h: + * ace/SSL/SSL_Export.h: + * websvcs/lib/websvcs_export.h: These files didn't check for + ACE_AS_STATIC_LIBS to determine if they should define their + export macros for static build. Thanks to Chris Kohlhoff + <chris@kohlhoff.com> for reporting this. [Bug 813] + +Sat Mar 3 19:07:31 2001 Pradeep Gore <pradeep@cs.wustl.edu> + + * ace/QoS/QoS_Session_Impl.cpp: + * ace/QoS/QoS_Session_Impl.i: + * examples/QOS/Fill_ACE_QoS.cpp: + * examples/QOS/Fill_ACE_QoS.h: + * examples/QOS/Makefile: + * examples/QOS/QoS_Util.cpp: + * examples/QOS/Receiver_QoS_Event_Handler.cpp: + * examples/QOS/Sender_QoS_Event_Handler.cpp: + Fixed various compile warnings when compiling with rapi=1 on + Redhat Linux 6.2 + +Sat Mar 3 16:47:53 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/fuzz.pl: + + Changed the detection pattern a bit to pick up + stuff like: + + void + operator < (...) + + better. + + * ace/Auto_Ptr.i: + * ace/Base_Thread_Adapter.cpp: + * ace/Based_Pointer_T.i: + * ace/Connector.cpp: + * ace/Containers_T.cpp: + * ace/DEV_Addr.i: + * ace/Dynamic.i: + * ace/FILE.cpp: + * ace/Flag_Manip.i: + * ace/Handle_Set.i: + * ace/Hash_Map_Manager_T.cpp: + * ace/Lib_Find.cpp: + * ace/Local_Name_Space_T.cpp: + * ace/Local_Tokens.cpp: + * ace/MEM_Addr.i: + * ace/Malloc.cpp: + * ace/Malloc_Allocator.cpp: + * ace/Malloc_T.cpp: + * ace/Memory_Pool.cpp: + * ace/Message_Block.cpp: + * ace/Message_Block.i: + * ace/Message_Block_T.cpp: + * ace/Message_Queue.i: + * ace/Message_Queue_T.cpp: + * ace/Message_Queue_T.i: + * ace/Naming_Context.cpp: + * ace/OS.cpp: + * ace/OS.i: + * ace/PI_Malloc.cpp: + * ace/POSIX_Asynch_IO.cpp: + * ace/Process_Manager.cpp: + * ace/QtReactor.cpp: + * ace/RB_Tree.i: + * ace/RW_Process_Mutex.cpp: + * ace/Reactor.cpp: + * ace/Remote_Name_Space.cpp: + * ace/Remote_Tokens.cpp: + * ace/SOCK_Dgram.i: + * ace/SString.cpp: + * ace/SUN_Proactor.cpp: + * ace/Select_Reactor_Base.cpp: + * ace/Select_Reactor_T.cpp: + * ace/Service_Object.i: + * ace/Service_Repository.cpp: + * ace/Signal.cpp: + * ace/Signal.i: + * ace/Svc_Handler.cpp: + * ace/Synch.cpp: + * ace/Synch_T.cpp: + * ace/Thread_Adapter.cpp: + * ace/Thread_Manager.cpp: + * ace/Timer_Heap_T.cpp: + * ace/TkReactor.cpp: + * ace/Token.cpp: + * ace/Token_Manager.cpp: + * ace/CLASSIX/CLASSIX_CO_Acceptor.i: + * ace/CLASSIX/CLASSIX_Select_Reactor.cpp: + * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp: + * netsvcs/ACE-netsvcs.html: + * netsvcs/lib/Server_Logging_Handler_T.cpp: + * netsvcs/lib/Token_Handler.cpp: + + Fixed bad ACE_TRACE and ACE_OS_TRACE's. (fuzz errors) + + * docs/ACE-categories.html: + * docs/ACE-porting.html: + * docs/ACE-subsets.html: + * docs/tutorials/new-tutorials.html: + + Changed references to + http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to + relative paths instead (Fixes the last of the fuzz errors). + +Fri Mar 2 20:08 Angelo Corsaro <corsaro@cs.wustl.edu> + + * include/makeinclude/platform_qnx_rtp_gcc.GNU: + Added macros tha expand to multiple libraries + on QNX RTP to fix most of the link problems. + +Fri Mar 2 16:35:58 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/config-win32-borland.h: + + Added /**/ to #include <vcl.h> so it isn't picked up by + MSVC-based dependency generators. + +Fri Mar 02 19:36:22 2001 Steve Huston <shuston@riverace.com> + + * ace/OS.i (ACE_OS::send): (only non-Win32), if call fails and + errno is EAGAIN, change it to EWOULDBLOCK. Improve portability + for platforms where EAGAIN and EWOULDBLOCK are different values + and both used, like HP-UX. Thanks to Michael Grove + <snowymike@aol.com> for reporting this problem. + + * ace/ACE.i (send_i): Call ACE_OS::send, not ACE_OS::write, on HP-UX. + This makes it pick up the EAGAIN->EWOULDBLOCK change. + + * tests/TSS_Test.cpp: Avoid doing ACE_Thread::keyfree on where + ACE_HAS_PTHREADS_DRAFT4 or ACE_HAS_PTHREADS_DRAFT6 (unless + ACE_HAS_TSS_EMULATION is also defined) since ACE_Thread::keyfree + will get ENOTSUP anyway. + +Fri Mar 02 17:50:40 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> + + * ace/QtReactor.cpp: + Thanks to Stefan Scherer <stefan_scherer@sepp.de> for reporting + and fixing the problem - crashing of TAO/tests/QtTests/ client + example after moving the slider. + +Fri Mar 02 15:35:40 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_Acceptor.cpp: + * ace/MEM_Acceptor.h: + * ace/MEM_Addr.cpp: + * ace/MEM_Addr.h: + * ace/MEM_Connector.cpp: + * ace/MEM_Connector.h: + * ace/MEM_IO.cpp: + * ace/MEM_IO.h: + * ace/MEM_SAP.cpp: + * ace/MEM_SAP.h: + * ace/MEM_Stream.cpp: + * ace/MEM_Stream.h: Disabled MEM_Stream support if one chooses + not to support position independent pointers. + +Fri Mar 02 13:17:36 2001 Steve Huston <shuston@riverace.com> + + * examples/IOStream/server/iostream_server.cpp (main): Removed the + call to register peer_acceptor with the reactor. The + acceptor::open call already registers for ACCEPT_MASK. Prevents + leaving a hanging READ_MASK registered after the acceptor is + destroyed when main() returns. This fixes Bugzilla # 801. Thanks + to Pim Philipse <pph@rogan-medical.com> for reporting this. + + * THANKS: Added Pim Philipse to the Hall of Fame. + +Fri Mar 02 12:24:27 2001 Steve Huston <shuston@riverace.com> + + * ace/config-hpux-10.x-hpc++.h: If compiling without exceptions + (+noeh) then don't set ACE_HAS_EXCEPTIONS (don't set + ACE_NEW_THROWS_EXCEPTIONS either). + + * ace/Thread_Manager.cpp (join_thr): Moved the code for + ACE_HAS_PTHREADS_DRAFT4 that does a pthread_detach from here to + ACE_OS::thr_join (which this function calls) so that + ACE_Thread::join also causes a pthread_detach. This is needed on + Pthreads Draft 4 (HP-UX 10.x) to properly clean up the thread + storage and avoid leaking memory. Thanks to Vladimir Kondratiev + <vladimir.kondratiev@intel.com> for reporting this and providing + excellent test cases to help resolve it quickly. + + * ace/OS.i (ACE_OS::thr_join): Added the code that was removed from + ACE_Thread_Manager::join_thr, above. + + * ace/Event_Handler.cpp (~ACE_Event_Handler): Add an ACE_Errno_Guard + around purge_pending_notifications to prevent against an ENOTSUP + from purge_pending_notifications. + +Thu Mar 1 17:02:10 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/PerlACE/Process_Unix.pm: + * bin/PerlACE/Process_Win32.pm: + + Fixed up the Spawn code to use the Executable () instead of + {EXECUTABLE}, since that's how we get the adjusted name (with + .exe and stuff). And also skipped the file existance with + IgnoreExeSubDir, since IgnoreExeSubDir is often used when you + need to find the program in the path. + +Thu Mar 1 15:48:10 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/fuzz.pl: + + Fuzz was being a bit to eager with the class matching in the + TRACE test. It was having problems with something like: + + char *foo::bar () + + since it thought the class was "char *foo" instead of just + "foo". + + But it is feeling muuuuuuch better now. + +Thu Mar 1 13:18:07 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/fuzz.pl: + + Added two new tests: + + - absolute ACE_wrappers test: + + Check for ~schmidt/ACE_wrappers in html files. These should + be relative links since these html files already exist in + their own ACE_wrappers tree. + + - TRACE test: + + Does a check on whether the ACE_TRACE or ACE_OS_TRACE actually + refers to the function/method it is in. + + And expanded the checks in the bad run_test test (level 6) + + * bin/PerlACE/Process_Unix.pm: + * bin/PerlACE/Process_Win32.pm: + + - Added checks for file existence before running. + - Added IgnoreExeSubDir option. + - Added TerminateWaitKill method. + + * bin/pippen.pl: (added) + * bin/PerlACE/MSProject.pm: (added) + * bin/PerlACE/MSProject/DSP.pm: (added) + * bin/PerlACE/MSProject/VCP.pm: (added) + + There is nothing to see here...please be on your way. + + It isn't like this is a super top secret project to + replace msvc_auto_compile.pl with something that works + better and also has a cool code-name that is shorter + than "msvc_auto_compile.pl". + + But remember, you didn't hear that from me. + +Thu Mar 1 10:54:23 2001 Ossama Othman <ossama@uci.edu> + + * bin/auto_run_tests.lst: + + Added the TAO Codec to the list of tests to run. + + * include/makeinclude/wrapper_macros.GNU: + + Fixed all incorrect uses of CFLAGS and CCFLAGS where + preprocessor macros were defined. Preprocessor macros should be + defined in the CPPFLAGS variable. + + Define ACE_USE_RCSID in non-debug builds (i.e. debug=0). + +Thu Mar 01 07:29:58 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Fixed typos in the Service_Context_Manipulation test. It was + running in platforms where it shouldn't. + +Thu Mar 01 07:07:03 2001 Christopher Kohlhoff <chris@kohlhoff.com> + + * include/makeinclude/recurse.bor: + Added support for makefiles which contain multiple targets. + + * examples/IPC_SAP/SOCK_SAP/Makefile.bor: + * examples/Log_Msg/Makefile.bor: + * examples/Map_Manager/Makefile.bor: + * examples/Mem_Map/file-reverse/Makefile.bor: + * examples/RMCast/Send_File/Makefile.bor: + * examples/Service_Configurator/IPC-tests/client/Makefile.bor: + * examples/Threads/Makefile.bor: + * netsvcs/clients/Logger/Makefile.bor: + * tests/Makefile.bor: + * tests/RMCast/Makefile.bor: + Updated to work with new multi-target makefile support. + +Wed Feb 28 22:58:50 2001 Carlos O'Ryan <coryan@uci.edu> + + * html/index.html: + Reference */index.html directly, instead of assuming that the + web browser will use index.html as the default file, this also + works better when browsing locally. Thanks to Alain Decamps + <Alain.Decamps@pidpa.be> for pointing this out. + +Wed Feb 28 16:41:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * docs/bugzilla-build-setup.html: + + Updated the section about the scoreboard and added a + placeholder for Win32 nightly build information. + +Wed Feb 28 16:04:14 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * bin/nightlybuilds/builds.lst (TYPE): Added a build with AMI and + Messaging support disabled for the nightly builds. + +Wed Feb 28 15:35:59 2001 Joe Hoffert <joeh@cs.wustl.edu> + + * docs/bugzilla-build-setup.html: + Added html file outlining steps for adding a bugzilla nightly + build. + +Wed Feb 28 00:25:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/auto_run_tests.lst: + + The examples/POA/Adapter_Activator/run_test.pl test was being + run twice. In fairness to all the other tests that only get to + run once, I removed the second instance. + +Tue Feb 27 17:31:48 2001 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_hpux_aCC.GNU: Turn on -D_REENTRANT for + the threads=0 build - this enables the reentrant functions which + are present, threads or not. It does not turn on threads, which + are instead enabled by -D_POSIX_C_SOURCE=199506L. + + * ace/config-hpux-11.00.h: Added ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R + + * ace/OS.i (rand_r): Added 'defined (HPUX_11)' to the ways to get to + the POSIX.1c-conformant version of rand_r. Allows clean compile + on HP-UX 11 without thread support. Also lined up some + misaligned #if/else/endif lines to make it easier to find one's + way through. + + * ace/OS_Dirent.inl (readdir_r): Added 'defined (HPUX_11)' to the + ways to get the POSIX.1c-conformant version of readdir_r. Allows + clean compile on HP-UX 11 without thread support. + +Tue Feb 27 11:38:38 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * performance-tests/TCP/tcp_test.cpp (main): Zapped the + non-existent '-f' option. Thanks to Mike Curtis for reporting + this. + + * performance-tests/TCP/tcp_test.cpp (main): Check for improper + bufsz. Thanks to Mike Curtis for reporting this. + + * performance-tests/TCP/tcp_test.cpp (main): Documented the '-t' + option, which specifies the number of threads. + + * performance-tests/TCP/README: Fixed a typo. Thanks to + Mike Curtis for reporting this. + +Tue Feb 27 10:51:18 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * bin/auto_run_tests.lst: Added the AMI tests to the daily + builds. + +Tue Feb 27 10:23:20 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * Makefile: Changed the ChangeLog listing in the CONTROLLED_FILES + to ChangeLog*. This should help us to avoid missing ChangeLog + entries in the beta distribution, just about every time we split + and add a ChangeLog. + +Mon Feb 27 07:39:16 2001 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_hpux_aCC.GNU: + + Removed suppression of Future Error 129. + Removed the use of CFLAGS. + + * ace/OS.h: + * ace/config-hpux-11.00.h: + Modification to remove system header macro definition conflicts. + This change does not suppress the conflicts, but does an undef + of the two conflicting macros before includeing tcp.h. Thanks + to Sam Chong <sam@i2i-inc.com> for reporting this problem. + +Mon Feb 26 19:01:16 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Logging_Strategy.{h,cpp}: Added a new -k option to + set the logging key via the ACE_Logging_Strategy. Thanks to + Chris Kohlhoff <chris@kohlhoff.com> for contributing this. + +Mon Feb 26 18:18:38 2001 Steve Huston <shuston@riverace.com> + + * ace/SString.i + (ACE_CString::find (const char *s, int pos) const): + (ACE_CString::find (char c, int pos) const): + (ACE_SString::find (const char *s, int pos) const): + (ACE_SString::find (char c, int pos) const): + (ACE_WString::find (const ACE_WSTRING_TYPE *s, int pos) const): + If match is found, return index from start of string, not from + 'pos'. Matches the C++ string standard, which was the model for + these classes. Thanks to Glen Osterhout <gosterho@elronsw.com> + for this fix. + + * ace/SString.h: Clarified comments on return value for above + functions. + + * tests/SString_Test.cpp: Changed to look for the correct return + from the npos tests of the functions above. + + * THANKS: Added Glen Osterhout to the Hall of Fame. + +Mon Feb 26 15:01:55 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/DLL_Test_Impl.dsp: + * tests/version_tests/DLL_Test_Impl.dsp: (removed) + Me thinks that the Release and Static configurations should + also compile, and me thinks that it is now fixed. + +Mon Feb 26 12:29:45 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg) + method assumes ownership of <next_arg>, rather than copying it. + Thanks to Steve Hespelt <shespelt@bear.com> for reporting this. + Fixes [Bug 807]. + + The generated version_tests dsp didn't work (since DLL_Test_Impl + creates a library). Manually created the configurations in the + tests/DLL_Test_Impl.dsp version instead. + +Mon Feb 26 15:54:33 2001 Phil Mesnier <mesnier_p@ociweb.com> + + Port to Unixware 7 (7.1.1) Using UDK CC (7.1.1.b) + + * docs/tutorials/013/message_queue.cpp: + * tests/Malloc_Test.cpp: + + Fixed errors in #pragma instiate lines including removal of ';', + mispellings + + * ace/config-all.h: + + Added definition of Unixware UDK for definition of ACE_NOTREACHED() + + * ace/config-unixware-7.1.0.udk.h: + * include/makeinclude/platform_unixware_udk.GNU: + + New configuration files for building on Unixware 7 with UDK CC. + +Mon Feb 26 12:29:45 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg) + method assumes ownership of <next_arg>, rather than copying it. + Thanks to Steve Hespelt <shespelt@bear.com> for reporting this. + Fixes [Bug 807]. + +Mon Feb 26 12:27:46 2001 Jeff Parsons <parsons@cs.wustl.edu> + + * ace/CDR_Stream.h: + * ace/CDR_Stream.i: + Added method to reset the byte order in class OuputCDR. This + will be used by a gateway to set the byte order of a reply to a + reqest it has handled to one different than the gateway's own + byte order, if necessary. It should be called while the stream + is still empty, that is, before any part of the reply, including + the header, has been marshaled. + +Mon Feb 26 12:07:00 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Memory_Pool.cpp: Moved the copying of MMAP flags up before + setting the MAP_FIXED flag. Thanks to <rhuber@amadeus.net> for + reporting this. [Bug 752] + +Mon Feb 26 09:29:36 2001 Carlos O'Ryan <coryan@cs.wustl.edu> + + * ace/RB_Tree.h: + Fully qualified enum name. This fixes problems on gcc-272 builds. + +Mon Feb 26 00:19:28 2001 Darrell Brunsch <brunsch@uci.edu> + + Time to do some spring cleaning... + + * tests/version_tests/Config_Test.dsp: (added) + * tests/version_tests/DLL_Test_Impl.dsp: (added) + * tests/version_tests/Log_Msg_Test.dsp: (added) + * tests/version_tests/Message_Queue_Test_Ex.dsp: (added) + * tests/version_tests/version_tests.dsw: + + Updated the version_tests dir with create_vt_dsps.pl. + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + * netsvcs/lib/netsvcs.dsp: + * netsvcs/servers/servers.dsp: + * tests/ACE_Init_Test.dsp: + * tests/Atomic_Op_Test.dsp: + * tests/Auto_IncDec_Test.dsp: + * tests/Barrier_Test.dsp: + * tests/Basic_Types_Test.dsp: + * tests/Buffer_Stream_Test.dsp: + * tests/CDR_Array_Test.dsp: + * tests/CDR_File_Test.dsp: + * tests/CDR_Test.dsp: + * tests/Cache_Map_Manager_Test.dsp: + * tests/Cached_Accept_Conn_Test.dsp: + * tests/Cached_Conn_Test.dsp: + * tests/Capabilities_Test.dsp: + * tests/Collection_Test.dsp: + * tests/Config_Test.dsp: + * tests/Conn_Test.dsp: + * tests/DLL_Test.dsp: + * tests/DLList_Test.dsp: + * tests/Dirent_Test.dsp: + * tests/Dynamic_Priority_Test.dsp: + * tests/Enum_Interfaces_Test.dsp: + * tests/Env_Value_Test.dsp: + * tests/Future_Set_Test.dsp: + * tests/Future_Test.dsp: + * tests/Handle_Set_Test.dsp: + * tests/Hash_Map_Bucket_Iterator_Test.dsp: + * tests/Hash_Map_Manager_Test.dsp: + * tests/High_Res_Timer_Test.dsp: + * tests/IOStream_Test.dsp: + * tests/Lazy_Map_Manager_Test.dsp: + * tests/Log_Msg_Test.dsp: + * tests/MEM_Stream_Test.dsp: + * tests/MM_Shared_Memory_Test.dsp: + * tests/MT_Reactor_Timer_Test.dsp: + * tests/MT_SOCK_Test.dsp: + * tests/Malloc_Test.dsp: + * tests/Map_Manager_Test.dsp: + * tests/Map_Test.dsp: + * tests/Mem_Map_Test.dsp: + * tests/Message_Block_Test.dsp: + * tests/Message_Queue_Notifications_Test.dsp: + * tests/Message_Queue_Test.dsp: + * tests/Message_Queue_Test_Ex.dsp: + * tests/Naming_Test.dsp: + * tests/New_Fail_Test.dsp: + * tests/Notify_Performance_Test.dsp: + * tests/OS_Test.dsp: + * tests/Object_Manager_Test.dsp: + * tests/OrdMultiSet_Test.dsp: + * tests/Pipe_Test.dsp: + * tests/Priority_Buffer_Test.dsp: + * tests/Priority_Reactor_Test.dsp: + * tests/Priority_Task_Test.dsp: + * tests/Process_Manager_Test.dsp: + * tests/Process_Mutex_Test.dsp: + * tests/Process_Strategy_Test.dsp: + * tests/RB_Tree_Test.dsp: + * tests/Reactor_Exceptions_Test.dsp: + * tests/Reactor_Notify_Test.dsp: + * tests/Reactor_Performance_Test.dsp: + * tests/Reactor_Timer_Test.dsp: + * tests/Reactors_Test.dsp: + * tests/Reader_Writer_Test.dsp: + * tests/Recursive_Mutex_Test.dsp: + * tests/Refcounted_Auto_Ptr_Test.dsp: + * tests/Reverse_Lock_Test.dsp: + * tests/SOCK_Connector_Test.dsp: + * tests/SOCK_Send_Recv_Test.dsp: + * tests/SOCK_Test.dsp: + * tests/SPIPE_Test.dsp: + * tests/SString_Test.dsp: + * tests/SV_Shared_Memory_Test.dsp: + * tests/Semaphore_Test.dsp: + * tests/Service_Config_Test.dsp: + * tests/Sigset_Ops_Test.dsp: + * tests/Simple_Message_Block_Test.dsp: + * tests/Svc_Handler_Test.dsp: + * tests/TSS_Test.dsp: + * tests/Task_Test.dsp: + * tests/Thread_Manager_Test.dsp: + * tests/Thread_Mutex_Test.dsp: + * tests/Thread_Pool_Reactor_Test.dsp: + * tests/Thread_Pool_Test.dsp: + * tests/Time_Service_Test.dsp: + * tests/Time_Value_Test.dsp: + * tests/Timeprobe_Test.dsp: + * tests/Timer_Queue_Test.dsp: + * tests/Tokens_Test.dsp: + * tests/UPIPE_SAP_Test.dsp: + * tests/Upgradable_RW_Test.dsp: + + Removed the Alpha configurations. I don't think we've actually + looked at these for over a year, and they are missing from a lot + of projects. Thankfully, they are easy to recreate if they are + needed. + + * ACE-INSTALL.html: + + Changed the Windows NT Alpha section to mention that we no + longer have configurations out of the box for Win32/Alpha, they + must be recreated if needed. + + * WindozeCE/ACEApp.cpp: (removed) + * WindozeCE/ACEApp.h: (removed) + * WindozeCE/README: (removed) + * WindozeCE/StdAfx.cpp: (removed) + * WindozeCE/StdAfx.h: (removed) + * WindozeCE/WindozeCE.aps: (removed) + * WindozeCE/WindozeCE.clw: (removed) + * WindozeCE/WindozeCE.cpp: (removed) + * WindozeCE/WindozeCE.dsp: (removed) + * WindozeCE/WindozeCE.h: (removed) + * WindozeCE/WindozeCE.rc: (removed) + * WindozeCE/WindozeCEDlg.cpp: (removed) + * WindozeCE/WindozeCEDlg.h: (removed) + * WindozeCE/resource.h: (removed) + * WindozeCE/res/WindozeCE.ico: (removed) + * WindozeCE/res/WindozeCE.rc2: (removed) + + No longer used. + + * Makefile: + + Removed WindozeCE from CONTROLLED_FILES. + + * tests/WinCE/Atomic_Op_Test.dsp: (removed) + * tests/WinCE/Barrier_Test.dsp: (removed) + * tests/WinCE/Basic_Types_Test.dsp: (removed) + * tests/WinCE/Buffer_Stream_Test.dsp: (removed) + * tests/WinCE/Conn_Test.dsp: (removed) + * tests/WinCE/DLL_Test.dsp: (removed) + * tests/WinCE/Enum_Interfaces_Test.dsp: (removed) + * tests/WinCE/Future_Test.dsp: (removed) + * tests/WinCE/Handle_Set_Test.dsp: (removed) + * tests/WinCE/Hash_Map_Manager_Test.dsp: (removed) + * tests/WinCE/MT_Reactor_Timer_Test.dsp: (removed) + * tests/WinCE/MT_SOCK_Test.dsp: (removed) + * tests/WinCE/Map_Manager_Test.dsp: (removed) + * tests/WinCE/Mem_Map_Test.dsp: (removed) + * tests/WinCE/Message_Block_Test.dsp: (removed) + * tests/WinCE/Message_Queue_Notifications_Test.dsp: (removed) + * tests/WinCE/Message_Queue_Test.dsp: (removed) + * tests/WinCE/Notify_Performance_Test.dsp: (removed) + * tests/WinCE/OrdMultiSet_Test.dsp: (removed) + * tests/WinCE/Priority_Buffer_Test.dsp: (removed) + * tests/WinCE/Priority_Task_Test.dsp: (removed) + * tests/WinCE/Reactor_Exceptions_Test.dsp: (removed) + * tests/WinCE/Reactor_Notify_Test.dsp: (removed) + * tests/WinCE/Reactor_Performance_Test.dsp: (removed) + * tests/WinCE/Reactor_Timer_Test.dsp: (removed) + * tests/WinCE/Reactors_Test.dsp: (removed) + * tests/WinCE/Reader_Writer_Test.dsp: (removed) + * tests/WinCE/Recursive_Mutex_Test.dsp: (removed) + * tests/WinCE/SOCK_Connector_Test.dsp: (removed) + * tests/WinCE/SOCK_Test.dsp: (removed) + * tests/WinCE/SString_Test.dsp: (removed) + * tests/WinCE/Semaphore_Test.dsp: (removed) + * tests/WinCE/Sigset_Ops_Test.dsp: (removed) + * tests/WinCE/Simple_Message_Block_Test.dsp: (removed) + * tests/WinCE/TSS_Test.dsp: (removed) + * tests/WinCE/Task_Test.dsp: (removed) + * tests/WinCE/Thread_Manager_Test.dsp: (removed) + * tests/WinCE/Thread_Mutex_Test.dsp: (removed) + * tests/WinCE/Thread_Pool_Test.dsp: (removed) + * tests/WinCE/Time_Value_Test.dsp: (removed) + * tests/WinCE/Timer_Queue_Test.dsp: (removed) + * tests/WinCE/ce_tests.dsw: (removed) + + Removed these Windows CE Toolkit for Visual C++ files. + +Mon Feb 26 00:15:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/DLL_Test_Impl.dsp: + + Made sure the Code Generation settings were correct. + +Sun Feb 25 19:40:11 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/ACEutils.pm (CheckForConfig): + This routine was not removing all the -Config options from the + command-line, causing problems in some of the tests. + +Sun Feb 25 16:33:26 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/DLL_Test.cpp: + + Left the DLL end with a d in debug mode, but changed + the test to add the d when _DEBUG and ACE_WIN32 is + defined. Test should now work again on Win2000_Debug. + +Sun Feb 25 11:28:06 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/run_test.pl: + + When there are errors in the log, print out the entire + log. This should make it much easier to understand + problems in the nightly build logs. + +Sun Feb 25 09:04:43 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/DLL_Test.cpp: + Accidentally left the 'd' suffix in the name of the DLL. + +Sat Feb 24 22:58:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/msvc_auto_compile.pl: + * TAO/TAOACE.dsw: + * TAO/TAOACE_Static.dsw: + * Static_Performance.dsw: + + Removed references to gperf_lib.dsp + + * TAO/version_tests.dsw: (removed) + + This was still referring to orbsvcs.dsp, which shows that + it is way out of date (and not used). Zapped. + +Sat Feb 24 20:59:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * apps/gperf/src/gperf.dsp: + * apps/gperf/src/gperf.dsw: + * apps/gperf/src/gperf_lib.dsp: (removed) + + Merged gperf into one project. This will bring the + structure in line with the Makefiles. + +Sat Feb 24 19:28:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS.i: + + Fixed my recent changes to ACE_OS::dlsym () to work on + Windows CE. + +Sat Feb 24 17:50:38 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/DLL_Test.cpp: + + OBJ_PREFIX was being created by attaching a char string to + a ACE_TCHAR string. Needed to add ACE_TEXT to the first + string for compilation on ACE_USES_WCHAR. + + * tests/DLL_Test_Impl.dsp: + + Changed the internal name to "DLL_Test DLL" to make sure + this gets compiled in the first pass by msvc_auto_compile.pl. + + * tests/run_test.pl: + + Added a check for LM_WARNINGs in log files. Let's see if + there have been any hidden (DLL_Test actually was producing + a warning on Windows, but Carlos's fix already got rid of it, + Yay!). + +Sat Feb 24 15:44:58 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/tests.dsw: + * tests/DLL_Test_Impl.dsp: + Add new project file for the shared library used in the test. + + * tests/DLL_Test.cpp: + * tests/DLL_Test_Impl.cpp: + Change the Win32 version to load a shared library instead of the + exe. + +Sat Feb 24 14:07:11 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/Thread_Pool_Reactor_Test.cpp: + + Did a careful study of what this test was doing in regards to + sending wide-character strings, and made it consistent. The + most troublesome aspect was the fact that the length is encoded + in the shutdown string ("\011shutdown") which meant that I had + to send the length in characters, not in bytes. This should + really fix [Bug 537]. + +Sat Feb 24 14:37:00 2001 Craig Rodrigues <crodrigu@bbn.com> + + * ace/config-g++-common.h + gcc 2.97 and higher require the use of the std namespace for + iostrams + +Sat Feb 24 10:27:04 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Disable the interceptor tests when the ORB is compiled without + interceptor support. + + * tests/run_test.lst: + Disable the Reactor_Notify_Test on single threaded builds, it + uses threads. + + * bin/nightlybuilds/scoreboard_update.pl: + Fixed usage message. + +Sat Feb 24 09:45:18 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/run_test.lst: + Disable the DLL_Test on KCC/Linux builds. The test runs + normally, but crashes on shutdown(), it appears as if the + run-time system is invoking the destructors after the library is + unloaded. + + * tests/Makefile: + * tests/Makefile.DLL_Test: + * tests/DLL_Test.h: + * tests/DLL_Test.cpp: + * tests/DLL_Test_Impl.h: + * tests/DLL_Test_Impl.cpp: + Cleanup code, and truly separate the shared library code to a + completely new separate file. + +Sat Feb 24 09:51:45 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_compile: + Pass the -Config options to each script, this helps the + $ACE_ROOT/bin/run_test.pl script that needs to disable some + tests in certain configurations. + +Sat Feb 24 08:21:48 2001 David L. Levine <levine@cs.wustl.edu> + + * include/makeinclude/platform_vxworks5.x_g++.GNU: + added -fno-implicit-templates on Tornado II for Intel 386 + family targets. Thanks to Albert Wijnja <Albert.Wijnja@meco.nl> + for reporting that static template data members weren't really on + VxWorks/386, and to Greg Holtmeyer <greg.holtmeyer@windriver.com> + for confirming that -fno-implicit-templates should work with + the Tornado II g++. [Bug 658] + +Thu Feb 22 15:59:04 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/OS.i: The ACE_TRACE call for ACE_OS::gmtime identified the + function as "localtime". This is now fixed. Thanks to Mason + Deaver <mason.deaver@tripointglobal.com> for reporting this. + +Fri Feb 23 19:44:36 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * ACE version 5.1.13 released. + +Thu Feb 22 12:28:15 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/TP_Reactor.cpp (handle_events): Here is the description of + how things were working and where the problem was: In the + TP_Reactor there is one leader thread waiting in select() and + the others waiting on the token. During deactivation(), the + <deactivation_> flag is set on the reactor, signal_all_threads() + is called on the token, and an empty notification is send to the + current leader thread. signal_all_threads() sets the + <signal_all_threads_> flag on the Token when there are waiters + on the Token (does nothing if there are no waiters). This + scheme worked fine when there were leader and follower threads + waiting. When a new leader is chosen, it returns the magic + number 2 from token.acquire_read() and hence exits gracefully + from the handle_events(). However, the problem was that when + some (or all) of the TP threads are busy running upcalls, + signal_all_threads() was a no-op and the magic number 2 was not + returned from token.acquire_read() and hence the exit from + handle_events() was flagged as an error. + + The fix is as described below: + + (1) ACE_Token::signal_all_threads() does not make sense. The + token is a mutex, not a condition variable. Therefore, it does + not make sense to have a signal_all_threads() methods. Plus I + believe that the method does not do as advertised. Therefore, I + removed this method from the token class. + + (2) There is no need to signal all the threads in the + TP_Reactor. Marking the Reactor as closed and signaling the + leader thread is enough. The leader thread will wake up to + handle the empty event, the next leader will see that the + Reactor is closed and exit gracefully. This will continue until + all the waiters are drained. + + (3) With the above change, there is no need to check for an + magic returns from token.acquire_read(). When a thread gets the + token, it checks the deactivation flag before proceeding. If + the Reactor is closed, it gracefully exits. Otherwise, it + continues as leader. + + (4) Since there is no need to call token.signal_all_threads(), + ACE_TP_Reactor::wakeup_all_threads() can be removed since it is + now the same as ACE_Select_Reactor_T::wakeup_all_threads(). + + Note that this change should help with making + Thread_Pool_Reactor_Test run without shutdown errors. + + * ace/Select_Reactor_T.i (deactivate): The setting of the + <deactivated_> flag and waking up of all the threads should be + atomic. I am being picky about this one but I think am I right. + Also added the guard to the accessor. + +Thu Feb 22 08:51:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS.i: + + Bleh. Changed an && to || to make sure we get a symbolname + variable for non-Unicode Win32. + + "He who lives without committing any folly is not so + wise as he thinks" - La Rochefoucauld + +Thu Feb 22 08:43:30 2001 Carlos O'Ryan <coryan@uci.edu> + + * include/makeinclude/rules.local.GNU: + Add SunWS_cache and ir.out to the list of files removed by + the realclean pseudo-target. This directory is used by Sun/CC + 5.0 (and Forte), if not removed the information there can become + stale, and break the builds. + This should fix the Sun/CC 5.0 nightly builds. + +Thu Feb 22 07:51:36 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/OS.i: Reverted the change "Thu Feb 22 03:31:06 2001 + Krishnakumar B <kitty@ace.cs.wustl.edu> ". + +Thu Feb 22 03:31:06 2001 Krishnakumar B <kitty@ace.cs.wustl.edu> + + * ace/OS.i (dlsym): + Hopefully fixed the Win32 builds. Removed a extra ! in the + #ifdef. + +Thu Feb 22 02:58:36 2001 Krishnakumar B <kitty@ace.cs.wustl.edu> + + * VERSION: + * PROBLEM-REPORT-FORM: + * ace/Version.h: + Reverted the changes and restored the old versions of + these files as the beta build script was killed. Pain :-( + +Wed Feb 21 20:10:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS.i: + * tests/DLL_Test.cpp: + * tests/Thread_Pool_Reactor_Test.cpp: + + Fixed the remaining problems with the Win2000_Unicode tests. + [Bug 537] + +Tue Feb 20 21:19:39 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Svc_Conf.h: + Add ACE_Export macro for ace_create_service_type() it is used + outside the library now. + +Tue Feb 20 06:34:26 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * include/makeinclude/platform_sunos5_g++.GNU: Make sure to explicitly + set ACE_HAS_GNUG_PRE_2_8. Thanks to Christian von Mueffling + <cvm@aiss.de> for reporting this. + + * ace/Thread_Manager.cpp (cancel_grp): Fixed a typo in + the ACE_TRACE macro. Thanks to Mike Curtis for reporting this. + +Mon Feb 19 16:38:08 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * ace/Asynch_Acceptor.{h,cpp}: + Added method void handle (ACE_HANDLE) and made it call the base + class's handle(ACE_HANDLE) method to remove warning about + partial overloading. Fix suggested by Irfan. + +Sun Feb 18 21:55:16 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * ace/OS.h: + Added an extern "C" void ace_mutex_lock_cleanup_adapter before + the definition of ACE_PTHREAD_CLEANUP_PUSH to avoid warnings on + SunCC 5.x. + +Sun Feb 18 17:16:41 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * netsvcs/clients/Tokens/manual/manual.cpp (main), + * tests/Tokens_Test.cpp (main): Reordered the #ifdefs for the + ACE_HAS_TOKENS_LIBRARY stuff. Thanks to Kitty for reporting + this. + +Sun Feb 18 16:28:45 2001 Chris Gill <cdgill@cs.wustl.edu> + + * ace/RB_Tree.h: Changed order of method declarations to (hopefully) + dodge an internal compiler error on VxWorks. + +Sun Feb 18 09:59:18 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * netsvcs/clients/Tokens: + * netsvcs/servers/main.cpp (main): + * netsvcs/servers/svc.conf: + * netsvcs/lib/Token_Handler: Only compile this stuff if the + ACE_HAS_TOKENS_LIBRARY macro is enabled. Thanks to Carlos + for reporting this. + + * ace/Object_Manager.cpp: Added a check for ACE_HAS_TOKENS_LIBRARY + so we can skip initializing certain things if that macro is + undefined. + + * ace/Token_Collection.*: + * ace/Token_Invariants.*: + * ace/Token_Manager.*: + * ace/Local_Tokens.*: + * ace/Remote_Tokens.*: + * ace/Token_Request_Reply.*: + Only compile these files if ACE_HAS_TOKENS_LIBRARY is enabled + since this functionality does not appear to be widely used and + yet it takes up space. + + * tests/Tokens_Test.cpp (main): Only run this test if + ACE_HAS_TOKENS_LIBRARY is defined. + +Sat Feb 17 17:23:46 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/SOCK_Dgram_Mcast.cpp: + + Integrated a fix from Keith Nicewarner <knicewar@erg.sri.com> + In effect, this reverts the multicast code changed on + Fri Jan 26 11:18:15 2001 Douglas C. Schmidt ... + for all platforms except linux. + +Sat Feb 17 15:52:09 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/run_all_list.pm: + * tests/run_tests.pl: + Remove obsolete scripts. + +Sat Feb 17 13:26:17 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/POSIX_Asynch_IO.cpp (thread_function): Make sure to cast + -1 to void * since that's the signature of the method. Thanks + to Bala for reporting this. + + * ace/POSIX_Asynch_IO.cpp (thread_function): Zapped the unused + result local variable and also changed the logic to bailout if + handle_events() returns -1. This fixes a warning reported by + KCC. + +Fri Feb 16 17:39:16 2001 Mayur Deshpande <mayur@ics.uci.edu> + + * ace/config-qnx-rtp.h: Commented out ACE_HAS_NONSTATIC_OBJECT_MANAGER. + Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion. + + * include/makeinclude/platform_qnx_rtp_gcc.GNU: Added -fexceptions to + CCFLAGS and 'exceptions=1' at end of file. + Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion. + +Fri Feb 16 05:37:47 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Logging_Strategy.h: Updated the documentation to explain what + the various options mean. + + * tests/Log_Msg_Test.cpp (test_log_msg_features): Added + ACE_Log_Msg::PROCESS to a couple of priority_mask() calls to + make the test work correctly. Thanks to Kitty for reporting + this. + +Thu Feb 15 17:53:31 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * ace/Thread_Manager.i: Simplified casting in + ACE_Thread_Descriptor::get_next per suggestion from Carlos. + +Thu Feb 15 14:57:59 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * ace/Thread_Manager.i: Fixed typo in ACE_Thread_Descriptor::get_next. + +Thu Feb 15 11:33:55 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * tests/Refcounted_Auto_Ptr_Test.cpp (main): Always call ACE_OS::exit(0) + to make sure that this test terminates... + + * ace/Thread_Manager.i (get_next): Added an ACE_const_cast() to + make certain compilers happy. + + * ace/Logging_Strategy.cpp: Fixed some Unicode problems on Win32. + +Thu Feb 15 08:49:44 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/nightlybuilds/builds.lst: + Rename WashU builds so all the Debian builds appear together. + +Thu Feb 15 07:15:39 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Logging_Strategy.{h,cpp}: Added support to generate multiple + log files, rather than just two. Thanks to Orlando Ribeiro + <oribeiro@inescporto.pt> for this fix. + +Thu Feb 15 03:36:46 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * bin/nightlybuilds/builds.lst (WEB): + Added a new build with TAO_MINIMUM linked statically. + +Wed Feb 14 05:28:59 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Thread_Manager.{h,i}: Added const to state(), grp_id(), + task(), get_next(), and self(). Thanks to Johnny Willemsen + <jwillemsen@remedy.nl> for reporting this. + +Tue Feb 13 17:51:47 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * tests/Makefile.bor (TESTS): Added Dirent_Test to list of TESTS. + Thanks to Mike Curtis for reporting this. + + * tests/run_tests.bat: Fixed a typo so that Dirent_Test will run. + Thanks to Mike Curtis for reporting this. + +Wed Feb 14 12:08:10 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * ace/Read_Buffer.cpp: Fixed boundary condition in rec_read. + If record was a multiple of BUFSIZ and the record was + terminated with an EOF instead of a "term" character, + rec_read would return 0 instead of the actual data read in. + The problem was that the partial buffer fill size was being + checked instead of the total number of bytes read in. This + issue was noticed when trying to read in an IOR file in TAO + that was exactly 512 bytes (BUFSIZ * 2 on Win2k) long. + +Tue Feb 13 14:44:28 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/ace_wchar.inl: Changed several variable from type <size_t> + to type <int> as on 64-bit whistler, size_t and int are not the + same size which confuses 64-bit compiler. (Per Kitty's + request.) + +Tue Feb 13 10:23:31 2001 Steve Huston <shuston@riverace.com> + + * apps/JAWS/server/IO.{h cpp}: (Side-affect necessitated by addition of + handle () method and handle_ member to ACE_Handler). Moved the + handle_ member to the JAWS_Synch_IO class - it needs it, and + JAWS_Asynch_IO class has it by inheritance from ACE_Handler. Left + the handle () methods in JAWS_IO, but made them pure virtual, + implemented in JAWS_Synch_IO (implementation moved from JAWS_IO) + and in JAWS_Asynch_IO, where they forward up to ACE_Handler's + handle () methods. + +Mon Feb 12 18:18:05 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * tests/Thread_Mutex_Test.cpp: + Modified test to use process mutexes for Win32 platforms + so that timed mutexes could be tested. + +Sun Feb 11 15:33:39 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/QoS/ACE_QoS_Export.h: + + Added ACE_AS_STATIC_LIBS support. + + * ace/QoS/ACE_QoS.dsp: + * ace/QoS/ACE_QoS_Lib.dsp: + + Fixed to comply with ACE standards. + +Sun Feb 11 10:50:10 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * include/makeinclude/platform_sunos5_g++.GNU (exceptions): + Only set the -fno-exceptions option if we're *not* using GCC + 2.7.2! Thanks to Pradeep for explaining how to do this. + +Sun Feb 11 10:15:08 2001 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Makefile.bor: + * ace/QoS/Makefile.bor: + * include/makeinclude/ace_flags.bor: + Added build support for QoS library with Borland compiler. + +Sat Feb 10 15:29:08 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Message_Block.h: + Improved documentation for the lenth(), size() and space() + methods. + +Sat Feb 10 07:19:37 2001 Christopher Kohlhoff <chris@kohlhoff.com> + + * include/makeinclude/outputdir.bor: + Removed the now out-of-date comment about pascal/non-pascal + build directories. + + * ace/config-win32-borland.h: + Added support for new ACE_HAS_VCL define to enable inclusion + of VCL header files. + +Fri Feb 9 16:47:44 2001 Pradeep Gore <pradeep@cs.wustl.edu> + + * ace/Makefile.am: + Removed references to the AQoSA files. + +Fri Feb 9 16:42:10 2001 Pradeep Gore <pradeep@cs.wustl.edu> + + * examples/QOS/client.dsp: + * examples/QOS/server.dsp: + Updated the corrected project files. + Thanks to Darrell for pointing this out. + +Thu Feb 8 19:25:03 2001 Carlos O'Ryan <coryan@uci.edu> + + * performance-tests/RPC/run_test.pl: + * performance-tests/TCP/run_test.pl: + * performance-tests/UDP/run_test.pl: + Add driver strings + +Thu Feb 08 19:18:36 2001 Angelo Corsaro <corsaro@cs.wustl.edu> + + * bin/auto_run_tests.lst: + + Removed comment from Exposed Policies test. The test has been fixed. + +Thu Feb 8 14:11:36 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/ws2tcpip.h: [Removed] + + I don't see any reason to have this file in ace; it is a system + header file. And from [Bug 722], our version is out of date anyway. + + * ace/OS.h: + + Changed to include system version of ws2tcpip.h + + * ace/Makefile.am: + * ace/ace-dll.icc: + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + + Removed references to ws2tcpip.h. + + * ace/SOCK_Connect.cpp: + + Changed get_ip_interfaces to remove a memory error. Thanks to + Viatcheslav Batenine <slavikb@infra2000.com> for helping out with + this. + + * ace/SOCK_Dgram_Mcast.cpp: + + It looks like the change made on: + + Fri Jan 26 11:18:15 2001 Douglas C. Schmidt ... + + doesn't work on Win32. Reverted back to the old scheme for Win32 + only. + +Thu Feb 8 00:34:57 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * include/makeinclude/platform_sunos5_g++.GNU: Added support for + -fno-exception when exceptions=0 is given to the Makefile. + Thanks to Christian v. Mueffling <cvm@aiss.de> for reporting + this. + +Wed Feb 7 23:02:46 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/SUN_Proactor.cpp: Fixed the cancel_aiocb() method and added a + new overridden cancel_aio() method. Thanks to Alexander Libman + <Alibman@baltimore.com> for contributing this. + +Thu Feb 8 02:09:05 2001 Pradeep Gore <pradeep@cs.wustl.edu> + + * examples/QOS/Makefile: + * examples/QOS/client.dsp: + * examples/QOS/server.dsp: + Modified to use the ACE_QoS lib. + * Receiver_QoS_Event_Handler.cpp: + * Sender_QoS_Event_Handler.cpp: + Added missing Log_Msg.h for ACE_DEBUG. + Other files were modified to reflect changed directory location + of AQosA imclude files. + +Thu Feb 8 00:17:43 2001 Pradeep Gore <pradeep@cs.wustl.edu> + + * ace/QoS_Decorator.cpp: + * ace/QoS_Session_Factory.cpp: + * ace/SOCK_Dgram_Mcast_QoS.cpp: + * ace/QoS_Decorator.h: + * ace/QoS_Session_Factory.h: + * ace/SOCK_Dgram_Mcast_QoS.h: + * ace/QoS_Manager.cpp: + * ace/QoS_Session_Impl.cpp: + * ace/SOCK_Dgram_Mcast_QoS.i: + * ace/QoS_Manager.h: + * ace/QoS_Session_Impl.h: + * ace/QoS_Session_Impl.i: + Moved the AQoSA classes to ace/QoS directory. + + * ace/Makefile: + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + Removed the QoS related files, added QoS directory to build. + + * ace/Qos/Makefile + * ace/QoS/ACE_QoS.dsw: + * ace/QoS/ACE_QoS.dsp: + * ace/QoS/ACE_QoS_Lib.dsp: + * ace/QoS/ACE_QoS_Export.h: + Added Makefile and MSVC project files. + Thanks to Craig Rodrigues <crodrigu@bbn.com> for suggesting this + change and providing the patch. + +Wed Feb 7 11:34:56 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/Message_Queue_Test_Ex.cpp: + Fix build problems for single threaded environments. + +Wed Feb 7 09:03:22 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptors): Fixed + incorrect if/else branching. Thanks to Lu Yunhai + <luyunhai@huawei.com> for reporting this. + +Tue Feb 6 23:43:49 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * apps/Gateway/Peer/Peer.cpp (await_events): Fixed the use of + %s to be %*s since the string may not be nul terminated! Thanks + to Lu Yunhai <luyunhai@huawei.com> for reporting this. + +Tue Feb 6 20:11:28 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * include/makeinclude/platform_sunos5_sunc++.GNU: + + Remove double inclusion of $(CFLAGS) for Sun CC 5.0. + +Tue Feb 6 19:30:26 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * ace/Malloc_T.cpp (shared_malloc): + Added a #ifdef to remove the warnings from Digital Tru64 cxx. This + is a temporary workaround. TODO: Change ACE_SEH_* macros so that such + hacks are unnecessary. + +Tue Feb 6 19:23:16 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * include/makeinclude/platform_sunos5_sunc++.GNU: + Complete reverting the changes made by Irfan on Sat Jan 27 + 01:06:09 2001. This file was missed in the last revert done by me. + +Tue Feb 06 19:03:35 2001 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_sunos5_sunc++.GNU: For C++ 5, make sure + to add CFLAGS into CCFLAGS, even if no other options are added. Else + things get built without -mt. + +Tue Feb 06 18:37:41 2001 Steve Huston <shuston@riverace.com> + + * tests/Thread_Mutex_Test.cpp: Changed wording of the message for + "timed acquire" not supported so as not to trip the error catcher + in run_tests.pl. + +Tue Feb 06 17:55:28 2001 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/post_completions.cpp: Allow this to + run with AIOCB_Proactor. + + * ace/Asynch_IO.{h cpp}: Added ACE_Handler::handle (ACE_HANDLE) + function to set the handle; changed ACE_HANDLE ACE_Handler::handle + to return the actual value. + + * ace/Asynch_Acceptor.cpp (handle_accept): Call ACE_Handler::handle + to set the handle value for the new handler before calling its + open() method. + +Tue Feb 06 17:16:43 2001 Steve Huston <shuston@riverace.com> + + * tests/MEM_Stream_Test.cpp: + * tests/MEM_Stream_Test.h: New file; moved definition of Echo_Handler + from MEM_Stream_Test.cpp to this file to make it visible to AIX + C++ 3.6.6 at template instantiation time. + +Mon Feb 5 16:19:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/ACE.cpp: ACE_TRACE ("ACE::basename") should be ACE_TRACE ("ACE::diname"). + Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this. + + * ace/Basic_Types.h: Changed the ACE_BIG_ENDIAN and ACE_LITTLE_ENDIAN + macros to use the form 0x0123 rather than 0123X. Thanks to + Craig Rodrigues <crodrigu@bbn.com> for helping find this + problem. + +Mon Feb 5 18:20:11 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * ace/config-sunos5.5.h (ACE_USES_OLD_IOSTREAMS): + + Reverted the change to config-sunos5.5.h and turned on + ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION, + ACE_TEMPLLATES_REQUIRE_SOURCE and ACE_USES_OLD_IOSTREAMS for the + SunCC 5.0 compiler. + +Mon Feb 5 16:19:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * examples/RMCast/Send_File/Receiver.cpp (init): Replaced + a hard-coded file permission of 0644 with + ACE_DEFAULT_FILE_PERMS. Thanks to Chris Kohlhoff + <chris@kohlhoff.com> for reporting this. + +Mon Feb 5 13:00:17 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * tests/Thread_Mutex_Test.cpp: (reported_notsup) + Removed a warning about defined but not used. + +Sat Feb 3 14:41:17 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS.h: + * ace/config-win32-msvc.h: + + Fixed problems with LLSEEK and ACE_stat on Windows CE. + +Sat Feb 3 14:12:36 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/Config_Test.cpp: + * tests/Config_Test.h: + * tests/Log_Msg_Test.cpp: + + Fixed ACE_USES_WCHAR problems. + +Fri Feb 02 18:36:42 2001 Steve Huston <shuston@riverace.com> + + * ace/config-linux-common.h: Added #define ACE_POSIX_AIOCB_PROACTOR + unless the user #defines ACE_POSIX_SIG_PROACTOR before including + config-linux.h. (At least prior to 2.4 kernels) queueing signals + across threads does not work - it fails silently, which breaks + basic functionality of the async model - like asynchronously + accepting TCP connections - and pretty much prevents multi-threaded + work with timers and probably other async operations. + + * examples/Reactor/Proactor/test_proactor.cpp: Disabled the ACE_DEBUG + calls that display message buffers - they're often too large and + overrun the ACE_Log_Msg buffers and crash the program. + +Fri Feb 2 08:38:37 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/WFMO_Reactor.cpp (handler): Set the existing_masks variable to 0 + to avoid warnings from static analysis tools. Thanks to Ivan + Murphy for reporting this. + +Thu Feb 01 22:00:17 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> + + * tests/Message_Queue_Test_Ex.cpp + + Fixed the bugs which were giving runtime error on + Win32 - removed "queue_type" from single_thread_performance_test + and performance_test functions. Now these funtions dont + have args. + + * tests/tests.dsw + + Just an update of the workspace. + +Thu Feb 1 21:00:57 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * bin/auto_compile_win32.pl: + * bin/run_all_list.pm: + + Added TAO RT Mutex unit tests to auto build and test + lists. + +Thu Feb 01 18:52:27 2001 Angelo Corsaro <corsaro@cs.wustl.edu> + + * RTJava: + Added Directory for RTJava related research. Check the + ChangeLog included in the newly directory for more info. + +Thu Feb 01 18:23:17 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> + + * tests/Log_Msg_Test.dsp: + * tests/Config_Test.dsp: + + Added these files. + * tests/tests.dsw: + + Added the above two projects to the workspace. + +Thu Feb 1 18:01:26 2001 Luther J Baker <luther@cs.wustl.edu> + + * ace/OS.i (mutex_init): + + Removed call into PACE. + +Thu Feb 01 18:21:15 2001 Steve Huston <shuston@riverace.com> + + * tests/Thread_Mutex_Test.cpp: Only report "operation not supported" + once for a failed ACE_Thread_Mutex::acquire (ACE_Time_Value &). + Also, if it reports ENOTSUP while ACE_HAS_MUTEX_TIMEOUT is + defined, warns the user that it's probably the wrong setting. + +Thu Feb 01 17:36:28 2001 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/test_proactor3.cpp: Fixed a non-constant + array dimension and some output formatting. + +Thu Feb 01 17:07:35 2001 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/post_completions.cpp: Removed extraneous + 'd' from the 'count' display. + +Thu Feb 01 15:33:26 2001 Steve Huston <shuston@riverace.com> + + * ace/Reactor.h (purge_pending_notifications): + * ace/WFMO_Reactor.h (purge_pending_notifications): + * ace/Select_Reactor_Base.h (purge_pending_notifications): + Removed the default argument value - callers must now explicitly + specify a 0 ACE_Event_Handler* to remove all handler notifications. + Thanks to Edan Ayal <edana@bandwiz.com> for arguing this point. + +Thu Feb 1 09:57:41 2001 Jeff Parsons <parsons@cs.wustl.edu> + + * ace/SString.i: + + Changed behavior of ACE_WString::rep to be the same + as ACE_CString::rep, that is, to return an empty + (w)string rather than a null (w)string when the length + is 0. Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> + for pointing out this discrepancy. + +Thu Feb 1 09:42:41 2001 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_chorus4.x_g++.GNU: + + Modification to allow building for Chorus 4.x on x86. CPU will be + set to x86, but CLX_TYPE will be set to i486-elf-sysv4. + +Thu Feb 01 10:29:31 2001 Steve Huston <shuston@riverace.com> + + * ace/Synch.i (ACE_Null_Mutex::acquire (ACE_Time_Value&)): Removed + the arg name to fix "unused argument" warning from g++. + +Wed Jan 31 22:01:00 2001 Rick Stille <stille_r@ociweb.com> + * ace/OS.cpp(operator FILETIME): Corrected an error in the Jan 26 GHS + revision. The term "ACE_Time_Value::FILETIME_to_timval_skew" had been + omitted from the calculation. + +Wed Jan 31 18:43:26 2001 Krishnakumar B <kitty@cs.wustl.edu> + + * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): + Removed the warning about queue_type using ACE_UNUSED_ARG. + +Wed Jan 31 17:27:35 2001 Steve Huston <shuston@riverace.com> + + * ace/Acceptor.cpp (ACE_Oneshot_Acceptor::handle_input): Unregister + the acceptor from the reactor before doing the shared_accept call + to guard against the use-case where the acceptor is destroyed during + the service handler activation sequence. + +Wed Jan 31 15:55:23 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * ace/Synch.i: + Added ACE_Null_Mutex::acquire (ACE_Time_Value &tv) + to fix link error. + +Wed Jan 31 15:12:00 2001 Jeff Parsons <parsons@cs.wustl.edu> + + * ace/CDR_Stream.h: + + Made method do_byte_swap() public. If ACE_ENABLE_SWAP_ON_WRITE + is defined, TAO_GIOP_Message_Base::format_message() and + TAO_GIOP_Message_Lite::format_message() both call this method. + Thanks to Paul Rubel <prubel@bbn.com> for reporting this bug. + +Wed Jan 31 12:19:51 2001 Steve Huston <shuston@riverace.com> + + * docs/tutorials/Chap_2/ex03.html, ex04.html: Fixed these example + programs to 1) send the Nul terminators with the strings, + 2) allow enough space on the recv to get it all, 3) return a + value from main. + + * docs/tutorials/Chap_2/Chap_2.zip: Updated the above examples. + +Wed Jan 31 06:43:27 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Message_Queue_T.cpp: Make sure that dequeue_head() returns + the number of items still on the queue. Thanks to Johnny + Willemsen for reporting this. + +Tue Jan 30 21:39:15 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> + + * tests/Log_Msg_Test.cpp: In funtion test_ostream(), removed the + if condition to check if ACE_OS::unlink() succeeds. Also set + the ostream to NULL before calling ACE_ERROR_RETURN(). Thanks + to Mike Curtis <mccurry@my-deja.com> for pointing out problem + caused when ACE_OS::unlink() fails. Thanks to Doug in helping + fix the problem. + +Tue Jan 30 18:04:08 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): + Zap the Win32 and VxWorks-specific code from this function. + Thanks to Sharath for reporting this. + +Tue Jan 30 11:34:26 2001 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/test_aiosig_ace.cpp: Fixed a bunch + of mis-coded ACE_ERROR_RETURNs; added a explicit queued completion, + and disabled the display of buffers that may overrun ACE_Log_Msg's + internal buffers to prevent spurious crashes. + +Tue Jan 30 11:26:42 2001 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/post_completions.cpp: Added a count + to be sure that all expected completions are delivered, and + print error message if not. + +Tue Jan 30 10:47:52 2001 Steve Huston <shuston@riverace.com> + + * ace/Select_Reactor_Base.cpp + (ACE_Select_Reactor_Notify::purge_pending_notifications): + * ace/WFMO_Reactor.cpp + (ACE_WFMO_Reactor_Notify::purge_pending_notifications): Changed + to not purge notifications destined for the reactor only + (notification buffer with 0 handler value). Thanks to Edan + Ayal <edana@bandwiz.com> for this fix. + +Tue Jan 30 01:05:51 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * tests/Message_Queue_Test_Ex.cpp (single_thread_performance_test): + Add cases for VxWorks and NT. Thanks to Sharath for reporting + this. + + * ace/OS.h: #define _SC_AIO_MAX to 1 if it's not set by default. + Thanks to Jean-Francois Daune <Daune@IBA.be> for reporting this + fix for VxWorks. + +Mon Jan 20 18:36:41 2001 Steve Huston <shuston@riverace.com> + + * ace/Message_Queue_T.h (ACE_Message_Queue_Ex): Use _USE + rather than _DECL to define the ACE_Message_Queue - fixes + compile error. + +Mon Jan 29 17:29:31 2001 Steve Huston <shuston@riverace.com> + + * ace/Message_Queue_T.{h i cpp}: Corrected a bunch of references + to Message_Queue_Ex's queue_ member to use . rather than -> + and removed the ACE_NEW to allocate it (follow-ups from Doug's + Sun Jan 28 08:32:07 2001 change). Fixed other compile + errors to allow tests/Message_Queue_Test_Ex.cpp to build. + FYI... whomever added this, it probably should have been named + Message_Queue_Ex_Test to conform. + +Mon Jan 29 15:30:27 2001 Steve Huston <shuston@riverace.com> + + * ace/POSIX_Proactor.{h cpp} (ACE_POSIX_SIG_Proactor): Don't + mask/block all signals, just the one(s) being used for this + sig proactor instance. Blocking everything can break other + things, such as debuggers and the ability to kill a program. + Also, don't setup a handler for the signals being blocked/waited + as this is a combination whose behavior is undefined. + +Sun Jan 28 08:39:17 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/Thread_Mutex_Test.cpp: + Fixed use of ACE_TEXT and string concatenation. + +Sun Jan 28 08:03:08 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/tests.dsw: + * tests/Message_Queue_Test_Ex.dsp: + Add NT project files for the new test + +Sun Jan 28 08:32:07 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * netsvcs/lib/Client_Logging_Handler.cpp: Fixed the order in which + the iostream messages are logged so that we don't bomb out when + the VERBOSE option is enabled. Thanks to Craig Rodrigues + <crodrigu@bbn.com> for helping find this problem. + + * ace/Message_Queue_T.h: Make sure the lock() forwarding method + forwards to queue_.lock(). + + * ace/Message_Queue_T.{h,i,cpp}: There's no reason to dynamically + allocate the implementation of ACE_Message_Queue_Ex -- instead + it can be simply an instance of ACE_Message_Queue. + + * ace/Message_Queue_T.h: Make sure that the methods on + ACE_Message_Queue_Ex are properly virtual. Thanks to Kitty for + pointing this out. + +Sat Jan 27 19:40:36 2001 Ossama Othman <ossama@uci.edu> + + * bin/auto_run_tests.lst: + + Added TAO's Portable Interceptor "Service_Context_Manipulation" + test to the list of tests to run. + +Sat Jan 27 19:34:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * tests/Config_Test.{h,cpp}: Fixed the use of "bool," which is + not supported on older compilers. Thanks to Kitty for reporting + this. + +Sat Jan 27 15:22:03 2001 Ossama Othman <ossama@uci.edu> + + * tests/Thread_Mutex_Test.cpp (test): + + Added code that tests mutex timeout functionality. + +Sat Jan 27 15:16:33 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/POSIX_Proactor.h: Replace ACE_Thread_Mutex with ACE_SYNCH_MUTEX + to avoid the need for conditional compilation. + + * ace/SUN_Proactor.h: Don't use ACE_Condition<ACE_Thread_Mutex> + but instead use the ACE_SYNCH_CONDITION, which also avoids the + need to conditionally compile for threaded platforms. + +Sat Jan 27 13:29:51 2001 Ossama Othman <ossama@uci.edu> + + * ace/config-linux.h: + + Declare the pthread_mutex_timedlock() prototype as an + 'extern "C"' function. This fixes an "unresolved symbol" link + error. + +Sat Jan 27 10:39:28 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/nightlybuilds/builds.lst: + Apparently the blank in 'RedHat 7.0' breaks the scoreboard. + +Sat Jan 27 01:06:09 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * include/makeinclude/platform_sunos5_sunc++.GNU: SPRO 5.0 + compiler should be able to support automatic template + instantiation. Also, standard C++ library should be ok. -g was + added to DCCFLAGS. + + * ace/config-sunos5.5.h: Turned off + ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION, + ACE_TEMPLATES_REQUIRE_SOURCE and ACE_USES_OLD_IOSTREAMS for the + SPRO 5.0 compiler. + + Thanks to J. Russell Noseworthy <rnosewor@objectsciences.com> + for contributing the above patches. + +Sat Jan 27 00:37:26 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/OS.i: + + - (mutex_lock): Windows code must use relative time since that + is what WaitForSingleObject() expects. Also, fixed extra + "return" before ACE_NOTSUP_RETURN. + + - (thread_mutex_lock): Made thread_mutex_lock() with timeout + close to the thread_mutex_lock() without timeouts. + +Fri Jan 26 21:53:45 2001 Ossama Othman <ossama@uci.edu> + + * ace/OS.h: + * ace/OS.i (thread_mutex_lock): + + Added an overloaded version of this method that accepts a + timeout argument. It delegates to the standard + ACE_OS::mutex_lock() method on non-Windows platforms. + Otherwise, it returns with an ENOTSUP. + + The addition of this method was necessary to fix a compile + problem related to the ACE_Thread_Mutex class. + + * ace/Synch.i (acquire): + + In ACE_Thread_Mutex::acquire() that accepts a timeout argument, + call the corresponding ACE_OS::thread_mutex_lock() method. This + fixes compile-time error on MS Windows builds due to the fact + that ACE_mutex_t and ACE_thread_mutex_t are different types on + that platform. + +Fri Jan 26 17:31:26 2001 Ossama Othman <ossama@uci.edu> + + * ace/OS.i (mutex_lock): + + Fixed unused argument warnings that occured when compiling for + the single threaded case. + +Fri Jan 26 16:58:03 2001 Ossama Othman <ossama@uci.edu> + + * ace/config-linux.h: + + glibc 2.1.x doesn't have the (very useful) __GLIBC_PREREQ + macro. Use a preprocessor test that doesn't rely on it. + +Fri Jan 26 16:48:06 2001 Ossama Othman <ossama@uci.edu> + + * ace/config-qnx-neutrino.h (ACE_HAS_MUTEX_TIMEOUTS): + * ace/config-qnx-rtp.h (ACE_HAS_MUTEX_TIMEOUTS): + + QNX supports pthread_mutex_timedlock(). Yes! + +Fri Jan 26 17:50:38 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/config-win32-common.h: + ace/config-vxworks-5.x.h: Added ACE_HAS_MUTEX_TIMEOUTS macro. + + * ace/OS.i: Added timed mutex operations for Win32, VxWorks, and + pSoS. + +Fri Jan 26 16:31:15 2001 Ossama Othman <ossama@uci.edu> + + * ace/OS.h (mutex_lock): + + Updated documentation for the version of this method that + accepts a timeout value. + + * ace/OS.i (mutex_lock): + + If the platform does not support timed mutexes, then return with + an ENOTSUP. + + * ace/Process_Mutex.h: + * ace/Process_Mutex.inl (acquire): + + Added version of this method that accepts a timeout value. + +Fri Jan 26 17:50:38 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp (report_stats): + Fixed some unintentional tabs. Thanks to Mike Curtis for + reporting this! + +Fri Jan 26 15:34:01 2001 Ossama Othman <ossama@uci.edu> + + * ace/OS.h: + * ace/OS.i (mutex_timedlock, mutex_lock): + * ace/Synch.i (acquire): + + Renamed the ACE_OS::mutex_timedlock() to the overloaded + ACE_OS::mutex_lock(). + +Fri Jan 26 14:13:32 2001 Ossama Othman <ossama@uci.edu> + + * ace/OS.h: + * ace/OS.i (mutex_timedlock): + + Wrapped the pthread_mutex_timedlock() function. It times out if + a lock hasn't been acquired by the given absolute time. + + * ace/Synch.h: + * ace/Synch.i (acquire): + + Added versions of this method that accept an ACE_Time_Value. + They are used to prevent blocking definitely while waiting for a + given mutex to become available. + + * ace/config-linux.h (ACE_HAS_MUTEX_TIMEOUTS): + + glibc 2.2.x supports the pthread_mutex_timedlock() function. + + * ace/config-linux-common.h: + + Undefine ACE_LACKS_{LLSEEK,LSEEK64}_PROTOTYPE prior to include + the KCC configuration file. Thanks to Jeff Greif + <jgreif@befree.com> for reporting this. + + * ace/README: + + Added ACE_HAS_MUTEX_TIMEOUTS to the list of ACE macros. + +Fri Jan 26 11:18:15 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Log_Msg.cpp (dump): Fixed some unintentional tabs. Thanks + to Mike Curtis for reporting this! + + * ace/SOCK_Dgram_Mcast.cpp (open): Modified the call to + ACE_SOCK_Dgram::shared_open() to just pass in this->mcast_ + rather than making a local copy that just contained the port + number. Thanks to Keith Nicewarner <knicewar@erg.sri.com> for + reporting this. + + * tests/Makefile.bor (TESTS): Added Message_Queue_Test_Ex.cpp. + +Fri Jan 26 13:37:30 2001 Luther J Baker <luther@cs.wustl.edu> + + * ace/OS.h: + + If using PACE, ACE_stat typedefs to pace_stat_s. + +Fri Jan 26 11:18:15 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * tests/Message_Queue_Test_Ex.cpp: Fixed some ASYS_* macros with + ACE_* stuff. Thanks to Darrell for reporting this. + + * ace/Message_Queue_T.h, + * ace/Message_Queue_T.i, + * ace/Message_Queue_T.cpp: + Added the ACE_Message_Queue_Ex, which provides a message queue + abstraction whose type is templatized. Thanks to Michael Vitalo + <mvitalo@sprynet.com> for contributing this. + + * tests/run_tests.lst: + * tests/run_test.lst: + * tests: Added support for the new Message_Queue_Test_Ex.cpp file. + Thanks to Michael Vitalo <mvitalo@sprynet.com> for contributing + this. + +Fri Jan 26 09:33:20 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Add TAO/tests/Object_Loader to the list + + * include/makeinclude/rules.lib.GNU: + Allow both .cpp and .c files in the LSRC macro. This should + let the PACE guys use the real name for their files, and + generate proper dependencies. + +Fri Jan 26 02:16:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/OS_Test.cpp: + + Changed a use of struct stat to ACE_stat. + +Thu Jan 25 19:16:48 2001 Ossama Othman <ossama@uci.edu> + + * ace/config-linux.h: + + Only define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS and + ACE_LACKS_THREAD_STACK_SIZE for glibc < 2.1. glibc 2.1+ has the + netdb reentrant functions (albeit with funky signatures), and it + has pthread_attr_setstacksize(). + + * ace/OS.h: + + Removed trailing whitespace. + + * ace/OS.i (getprotobyname_r, getprotobynumber_r, gethostbyaddr_r, + gethostbyname_r, getservbyname_r): + + Added glibc-specific calls to these functions. This allows us + to avoid grabbing a lock! Thanks to Ben Strong + <bstrong@bluelark.com> for providing the patch. + + * THANKS: + + Added Ben Strong to list of contributors. + +Thu Jan 25 20:10:24 2001 Irfan Pyarali <irfan@cs.wustl.edu> + + * include/makeinclude/platform_irix6.x_sgic++.GNU: + * include/makeinclude/platform_irix5.3_sgic++.GNU: + + Removed -rpath "$(ACE_ROOT)/ace" from LDFLAGS. + + * ace/Message_Queue_T.{h,i}: Moved code from .i to .h to work + around a compiler bug. The Sun Forte 6 (CC 5.1) compiler is + only happy if this is in the header file. + + * ace/Message_Block_T.cpp: Fixed template parameter name mismatch + between declaration and definition. + + Thanks to J. Russell Noseworthy <rnosewor@objectsciences.com> + for contributing the above patches. + +Thu Jan 25 10:50:35 2001 Steve Huston <shuston@riverace.com> + + * ace/Reactor.h: Add comments to schedule_wakeup/cancel_wakeup that + they don't cause an immediate re-examination of the masks like + register_handler does. Thanks to Oscar Rodriquez + <Oscar.Rodriquez@eln.ericsson.se> for prompting this clarification. + + * ace/WFMO_Reactor.cpp (ACE_WFMO_Reactor_Notify::handle_signal): + The call to ACE_Message_Queue::dequeue_head may change the + ACE_Time_Value passed to it, so don't override ACE_Time_Value::zero's + const-ness, lest ACE_Time_Value::zero take on some strange new value. + Thanks to Edan Ayal <edana@bandwiz.com> for this fix. + +Thu Jan 25 05:34:58 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Connector.cpp (connector): Added an ACE_const_cast() to + get rid of the const for the accessor method! + + * ace/Acceptor.cpp (acceptor): Added an ACE_const_cast() to + get rid of the const for the accessor method! + + * ace/Log_Msg.{h,cpp}, + * ace/Trace.{h,cpp}: The Log_Msg -I flag now uses the current + ACE_Trace nesting level rather than always using 1. Thanks to + Mike Curtis for providing this. + +Wed Jan 24 19:43:24 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/OS.i (lstat,stat): Separated win32 cases out. + +Wed Jan 24 18:15:59 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/OS.i (fstat): Oops, wrong version of this function was + modified. + +Wed Jan 24 14:44:12 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/FILE.cpp: + * ace/Filecache.cpp: + * ace/Filecache.h: + * ace/OS.h: + * ace/OS.i: + * ace/OS.cpp: Changed the signature of <stat>, <fstat>, and + <lstat> to use ACE_stat instead of "struct stat". Also changed + to use _fstat and _stat on win32 instead of <fstat> and <stat> + directly. Also replaced several use of "struct stat" to + ACE_stat. Thanks to Mike Anderson <manderson@sonusnet.com> for + reporting this. [Bug 762] + +Wed Jan 24 16:13:10 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/OS_Dirent.cpp: Fixed a bug in the readdir_emulation() method. + Thanks to Yung Trinh <ytrinh@email.com> for reporting this. + + * ace/Connector.{h,cpp}: Added a new connector() accessor to + return the underlying ACE_PEER_CONNECTOR. Thanks to Pedro + Brandao <pbrandao@inescn.pt> for suggesting this. + +Wed Jan 24 10:17:03 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Makefile: + Add dependencies (again). They were lost is a previous commit. + + * */Makefile: + Update dependencies (yet another time). + +Wed Jan 24 09:41:54 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Configuration.cpp: + Fixed warning under gcc. Also made the for() loop more + ACE-like, not better, but at least consistent. + +Wed Jan 24 08:56:16 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.h: + The changed to document the ACE_SVC_* macros were accidentally + lost, fixed. + + * ace/Service_Config.cpp: + New debug message when processing an explicit directive, useful + to find out when and why TAO invokes + ACE_Service_Config::process_directive() directly. + As with all other debug messages in this file it only shows up + if ACE::debug() returns non-zero. + +Wed Jan 24 01:44:47 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Configuration.cpp (expand_path): Fixed a bug with assignment to + temp in the loop. Thanks to Jonathan Reis for reporting this! + +Tue Jan 23 17:02:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/msvc_auto_compile.pl: + + Removed PACE until we figure out how to handle it in the + DLL builds. + +Tue Jan 23 16:50:35 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/Dirent_Test.dsp: + + Updated to make consistent with the rest of the dsps in + this directory in regards to output directories and non-use + of ACE_ROOT. + + * tests/Dirent_Test.cpp: + + Updated wide character compatibility and removed the use + of ACE_ROOT (now looks at ../tests", which should give + the same results). + + * tests/run_test.lst: + + Added the Dirent_Test to the list + + * tests/version_tests/Dirent_Test.dsp: (added) + * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (added) + * tests/version_tests/version_tests.dsw: + + Used the create_vt_dsps.pl script to update this directory. + +Tue Jan 23 18:03:26 2001 Jeff Parsons <parsons@cs.wustl.edu> + + * ace/CDR_Stream.cpp: + + Added patches to read_8 and write_8 sent in by + Keith Nicewarner <knicewar@erg.sri.com> to deal + with the ARM byte format for doubles + +Tue Jan 23 15:06:18 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/Configuration.cpp: + * ace/OS_Dirent.cpp: + + Updated wide character compatibility. + + * ace/ace_dll.dsp: + + Removed unneeded verbose library option. + +Tue Jan 23 10:54:14 2001 Jeff Parsons <parsons@cs.wustl.edu> + + * ace/config-doxygen.h: + * bin/autoconf_compile: + + Removed all occurrences of 'smart_proxies' and 'interface_repo'. + These are no longer necessary. + + * include/makeinclude/ace_flags.bor: + + Added necessary variables to go along with the Borland + makefiles for the new libraries tao/Domain and + tao/IFR_Client. + +Mon Jan 22 17:01:17 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS_String.cpp: + * ace/OS_String.inl: + * ace/ace_wchar.inl: + * ace/config-qnx-rtp.h: + + ACE_HAS_WCHAR fixes. Support is really bad on QNX RTP + so we just end up emulating most everything. As far as + I could tell, there isn't even a way to convert between + the two types of strings. + + * ace/OS_Dirent.cpp: + + Rewrote a paragraph to remove the use of "/*" in a larger + /*...*/ comment, since gcc complains about it. + + * tests/Message_Queue_Test.cpp: + + Backed out some changes to it on Jan 21, since it had + problems and I couldn't find any ChangeLog entry for the + changes (mistakenly checked in?). + +Mon Jan 22 13:51:11 2001 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/OS_Dirent.cpp (opendir_emulation): Added code to make the + emmulation work properly on Win32. Thanks to Edwin Wrench + <edwin.wrench@itt.com> for finding this. + + * tests/Dirent_Test.cpp: + tests/Makefile: + tests/run_tests.bat: + tests/run_tests.lst: Added test to verify correctness of above + fix. This test attempts to scan $ACE_ROOT/tests and will fail if + the number of entries is 0 or 1. + +Mon Jan 22 10:21:20 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Map_Manager.h: Clarify that find() returns 0, rather than + saying "a non-negative number". Thanks to Albert Wijna + <albert.wijnja@meco.nl> for clarifying this. + +Mon Jan 22 15:38:12 2001 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Containers_T.h: + ace/Containers_T.cpp: + Added operator* to the ACE_Ordered_Multiset_Iterator class + + * tests/Ordmultiset_test.cpp + Expanded test for the new operator* of the ACE_Ordered_Multiset_ + Iterator class + +Sat Jan 20 14:53:07 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Configuration.{h,cpp}: Fixed some problems with const char * + that was busting the compilation. Thanks to Carlos for pointing + this out. + + * ace/Configuration.{h,cpp}: Added several fixes for + mistakes with memory management and other minor problems. + Thanks to Jonathan Reis <reis@stentorsoft.com> for contributing + these fixes! + +Sat Jan 20 10:49:05 2001 Carlos O'Ryan <coryan@uci.edu> + + * docs/ACE-guidelines.html: + Update the guidelines to point people to the Doxygen + documentation, instead of the now abandoned OSE tools. + +Sat Jan 20 10:21:08 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.cpp: + Another pass fixing problems with ACE_BEGINTHREADEX() under + Win32, this time Win32 is working fine. + +Sat Jan 20 10:20:50 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * doc/tutorials: Integrated the new Service Configurator tutorial + into the main tutorials page. + +Fri Jan 19 16:57:43 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Svc_Handler.h: Updated the comments to explain why + operator new is overloaded. Thanks to Kirill Kuolechov + <Kirill.Koulechov@gmx.net> for reporting this. + +Fri Jan 19 15:39:43 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.cpp: + QNX/RTP has the same problem that LynxOS has, after fork() is + invoked trying to destroy the preallocated objects in + ACE_OS_Object_Manager fails. + Factor out this variation in a new macro: + ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK + + * ace/config-lynxos.h: + * ace/config-qnx-rtp.h: + Define the new macro for the two relevant platforms. + + * ace/README: + Document the macro. + +Fri Jan 19 15:08:37 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.cpp: + I disabled too much in the commit at 10:50am... Now it seems to + be OK. + + * ace/Makefile: + Remove extra -v + +Fri Jan 19 13:16:49 2001 Priyanka Gontla <pgontla@ece.uci.edu> + + * include/makeinclude/platform_hpux_aCC.GNU: + Added new options to the CCFLAGS so that the known future errors + arising because of HPUX are suppressed. + +Fri Jan 19 13:01:13 2001 Priyanka Gontla <pgontla@ece.uci.edu> + + * ace/SSL/Makefile: + Put a check for defining ACE_SHLIBS to get it compiled on HPUX. + + * ace/RMCast/Makefile: + * ace/Makefile : + Updated dependencies + + * ace/config-all.h + Fix a build problem on HP-UX 11.00 with aCC A.03.25. The macro + used to determine the use of the std namespace changed from + RWSTD_NO_NAMESPACE to _NAMESPACE_STD. NOTE: I did preserve the + check for RWSTD_NO_NAMESPACE with aCC versions less than A.03.25. + + Thanks to Chad Elliott <elliott_c@ociweb.com> for making this fix. + +Fri Jan 19 11:22:42 2001 Priyanka Gontla <pgontla@ece.uci.edu> + + * docs/tutorials/022/client_handler.cpp : + * docs/tutorials/022/client_hander.h : + * docs/tutorials/022/Acceptor_Service.cpp : + * docs/tutorials/022/Acceptor_Service.h : + * docs/tutorials/022/server.cpp : + * docs/tutorials/022/Makefile : + + * docs/tutorials/022/client/Makefile: + * docs/tutorials/022/client/client.cpp: + + * docs/tutorials/022/page01.html: + * docs/tutorials/022/page02.html: + * docs/tutorials/022/page03.html: + * docs/tutorials/022/page04.html: + * docs/tutorials/022/page05.html: + + Developed a new tutorial for the ACE_Service_Configurator. + Based on the ACE tutorial 005. + +Fri Jan 19 10:50:11 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.cpp: + Use the Green Hills specific tricks *only* if we are compiling + under Green Hills, and only for the platform where they make + sense (in this case Win32). + +Thu Jan 18 23:21:53 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.h: + Document the infamous ACE_STATIC_SVC macros. + +Thu Jan 18 23:50:35 2001 Rick Stille <stille_r@ociweb.com> + + The Green Hills(GHS) Native x86 compiler does not provide support + for 64-bit integers, structural exceptions, or DLL's. Thus the + keywords __int64, __try, __dllimport, etc., are not defined. In + addition, exceptions do not work in a multi-threaded environment. + The following changes were made to address these shortcomings. + + * ace/Basic_Types.h: Because the GHS compiler has both + ACE_LACKS_LONGLONG_T and ACE_WIN32 defined, the + ACE_LACKS_LONGLONG_T macro must appear first, so the order of + these two macros has been reversed in the defines of both + ACE_UINT64_LITERAL(n) and ACE_UINT64_DBLCAST_ADAPTER(n). + + * ace/config-win32-common.h: The typedef of ACE_UINT64 as an + unsigned __int64 and the define of ACE_HAS_LLSEEK are blocked + out for ghs. + + * ace/config-win32-ghs.h: This is the new configuration file for + Green Hills/Win32. + + * ace/Configuration.cpp(resolve_key): The "return 0" at the end of + this function has been blocked out for ghs to eliminate an + "unreachable code" warning. + + * ace/Event_Handler_T.h(handle_signal): The type of the "signum" + parameter has been changed to "int" so that it matches the type + in the Event_Handler class. + + * ace/Event_Handler_T.i(handle_signal): The type of the "signum" + parameter has been changed to "int" so that it matches the type + in the Event_Handler class. + + * ace/High_Res_Timer.cpp(global_scale_factor): The Native x86 + compiler defines "QuadPart" in the LARGE_INTEGER union as a + "double," so it cannot be used in the calculation of + "global_scale_factor." Instead, for GHS, the low and high parts + of the LARGE_INTEGER structure are copied into an ACE_UINT64 + structure (which is actually an ACE_U_LongLong) and the + ACE_U_LongLong operators are used. The code segment if + (ACE_High_Res_Timer::global_scale_factor_ == 1u) // Failed to + retrieve CPU speed from system, so calculate it. + ACE_High_Res_Timer::calibrate (); is unreachable hen ACE_WIN32 + is defined, so it has been blocked out for Win32 platforms to + silence the Green Hills "unreachable code" warning. + + * ace/High_Res_Timer.i(hrtime_to_tv): There is no assignment + operator that converts an ACE_U_LongLong to a "long," so an + intermediate ACE_U_LongLong variable "usec64" has been + introduced. The type of "msec" and "usec" have been changed from + "long" to ACE_UINT32, as have been the casts. The conversion is + then carried out by using the lower part of "usec64." + + * ace/Local_Name_Space_T.cpp(remap): The "DWORD" cast has been + removed from both EXCEPTION_CONTINUE_SEARCH and + EXCEPTION_CONTINUE_EXECUTION beause the function return value is + of type "int" and the cast was causing an "integer conversion + resulted in a change of sign" warning. + + * ace/Memory_Pool.cpp(map): Removed references to the "mem_offset" + variable because it was not being used and the compiler was + issuing a warning to this effect. + + * ace/NT_Service.cpp(startup): This function was returning "-1" + when svc_sc_handle() failed, and returning a "0" when + QueryServiceConfig() failed. Since the return type of this + function is "DWORD," the compiler was issuing an "integer + conversion resulted in a change of sign" warning for the "-1" + value. Upon investigation of this issue, it was discovered that + "0" is a valid service type value, and thus the use of "0" to + indicate failure is a bug. The return value for svc_sc_handle() + failure has been changed to "MAXDWORD - 1," which is the DWORD + equivalent of "-2," and the return value for failure of + QueryServiceConfig() has been changed to "MAXDWORD," which is + the DWORD equivalent of -1. + + * ace/OS.cpp: The compiler cannot handle a 64-bit literal, so the + literal passed to FILETIME_to_timval_skew has been created as + ACE_U_LongLong(0xd53e8000, 0x19db1de). + + * ace/OS.cpp(set): The Native x86 compiler defines "QuadPart" in + the LARGE_INTEGER union as a "double," so it cannot be used in + the calculations of tv_sec and tv_usec. Instead, the low and + high parts of the LARGE_INTEGER structure are copied into an + ACE_U_LongLong structure, and the ACE_U_LongLong operators are + used. + + * ace/OS.cpp(operator FILETIME): The Native x86 compiler defines + "QuadPart" in the LARGE_INTEGER union as a "double," so it + cannot be used in the calculation of file_time. Instead, tv_sec + and tv_usec are converted iinto ACE_U_LongLong structures and + the ACE_U_LongLong operators are used. + + * ace/OS.cpp(uname): The Native x86 compiler names both the union + and the structure within the SYSTEM_INFO structure, so the + "wProcessorArchitecture" member within the "s" structure, which + is itself within the "u" union, must be accessed by using + ".u.s." + + * ace/OS.cpp(ACE_BEGINTHREADEX): Green Hills compiler gets + confused when __stdcall is imbedded in parameter list, so the + type ACE_WIN32THRFUNC_T has been defined, then used within the + parameter list of ::_beginthreadex(). + + * ace/OS.h(ACE_Time_Value): The Native x86 compiler defines + "DWORDLONG" as type "double," so FILETIME_to_timval_skew is + instead defined as type ACE_U_LongLong. + + * ace/OS.h: The pragmas "#pragma warning( disable : ... " are + unknown to the Native x86 compiler, so it produces warnings to + this effect. These pragma have been blocked out for ghs. + + * ace/OS.h: Because the Native x86 compiler does not support the + __int64 keyword, the typedef of ACE_hrtime_t has been changed + from "unsigned __int64" to "ACE_UINT64" for ghs. Because no + usage of "ACE_QWORD" could be foound, its definition has been + blocked out for ghs. + + * ace/OS.i(gettimeofday):The code at the end of this function is + not reachable if either ACE_HAS_WINCE or ACE_WIN32 is + defined. In order to quiet the Green Hills compiler warnings + about unreachable code, this code has been blocked out for + ACE_HAS_WINCE and ACE_WIN32. With this code blocked out, + however, the variables "tv" and "result" are not used, and the + compiler warns about about variables defined, but never used. In + order to quiet these warnings, the definitions of these two + variables have been blocked out for ACE_HAS_WINCE and ACE_WIN32. + + * ace/OS.i(gethrtime): The ACE_gethrtime() function is not meant + to be used by a Win32 platform, but because both "ghs" and + "ACE_HAS_PENTIUM" are defined for the Native x86 platform, a + call to ACE_gethrtime() was included in the code. This problem + has been solved by adding "&& !defined(ACE_WIN32)" to the two + "... defined (ghs) && defined (ACE_HAS_PENTIUM)" statements + which block out references to ACE_gethrtime(). + + The Native x86 compiler defines "QuadPart" in the LARGE_INTEGER + union as a "double," so it cannot be used as the return + value. Instead, because the return type is "ACE_hrtime_t," which + is type "ACE_UINT64," the low and high parts of the + LARGE_INTEGER structure are copied into an ACE_UINT64, which is + then returned. + + * ace/Process_Manager.cpp(wait): The "result >= WAIT_OBJECT_0" + test within the ACE_ASSERT statement causes the Native x86 + compiler to produce a ôpointless comparison of unsigned + integer with zeroö warning because "result" is of type + "DWORD," which is defined by the Native x86 compiler as type + "unsigned int." This test has been blocked out for ghs. + + * ace/Profile_Timer.cpp(elapsed_time): Because the "__int64" + keyword is not defined by the Native x86 compiler, it cannot be + used to cast the value of "delta_t" in the calculation of + "real_time." But "delta_t" is of type "ACE_hrtime_t," and + ACE_hrtime_t is typedefed as ACE_U_LongLong, so the division + operator defined for in the ACE_U_LongLong class can be used + directly with a divisor of type "double." Thus the "__int64" + cast has been removed for ghs. + + * ace/Sock_Connect.cpp(get_reg_value): This function is used + within the function get_ip_interfaces() function only when + either ACE_HAS_WINSOCK2 is not defined or when ACE_HAS_WINSOCK2 + is defined as "0." Because ACE_HAS_WINSOCK2 is defined on the + Native x86 platform, the compiler was issuing a ôdefined, but + never usedö warning. This warning has been eliminated by + blocking out the definition of get_reg_value() when + ACE_HAS_WINSOCK2 is defined as a value other than "0." + + * ace/Stats.cpp(accumulate): The comparison "rhs.samples_count () + == 0" was producing a warning because rhs.samples_count() + returns an ACE_UINT32, but is being compared to the signed + literal "0." The "0" has been changed to "0u." + + * ace/WFMO_Reactor.cpp(ok_to_wait): The comparison of the "switch" + statement parameter "result" to "DWORD" values in the case + statements elicited an "integer conversion resulted in a change + of sign" warning from the compiler, so the type of "result" has + been changed to "DWORD." + + * ace/WFMO_Reactor.cpp(dispatch): The comparison of the "switch" + statement parameter "wait_status" to "DWORD" values in the case + statements elicited an "integer conversion resulted in a change + of sign" warning from the compiler, so the type of "wait_status" + has been cast to "DWORD." + + * ace/WFMO_Reactor.cpp(dispatch_handles): The "wait_status >= + WAIT_OBJECT_0" comparison was producing a ôpointless + comparison of unsigned integer with zeroö warning because + "wait_status" is an unsigned integer. This was a known problem + with Borland, so the blocking out of this comparison has been + extende to ghs. + + * tests/Basic_Types_Test.cpp(main): Because both the + ACE_LACKS_LONGLONG_T and ACE_WIN32 macros are defined, the + ACE_LACKS_LONGLONG_T macro must appear first, so the order of + these two macros has been reversed. + + * tests/Cached_Accept_Conn_Test.cpp: The template class + ACE_Node<ACE_HANDLE> must be explicitly instantiated for this + platform. + + * tests/Cached_Conn_Test.cpp: The template class + ACE_Node<ACE_HANDLE> must be explicitly instantiated for this + platform. + + * tests/Handle_Set_Test.cpp: The template class + ACE_Node<ACE_HANDLE> must be explicitly instantiated for this + platform. This was already being done for the _CRAYMPP, so it + has been extended to ghs. + + * tests/Malloc_Test.cpp: Because the Native x86 compiler does not + support structural exceptions, it cannot support the "remap" + function, so the blocking of the ACE_TEST_REMAP_ON_FAULT macro + definition, which was already in effect for linux, has been + extended to ghs. + +Thu Jan 18 12:49:53 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/SUN_Proactor.cpp: Added support for cancel_aiocb(). Thanks + to Alexander Libman <Alibman@baltimore.com> for contributing + this. + + * tests/Makefile.bor (TESTS): Added Config_Test so that this test + runs on Borland. + + * tests: Moved the config_test stuff (which tests ACE_Configuration* + classes) from the examples/Configuration/ directory to the + tests/ directory and made it a one-button test. + + * ace/Future.h: Changed the order of the thread mutex and the condition + variable to avoid confusion in the future regarding "order of + initialization." Thanks to Edan Ayal <edan@bandwiz.com> for + reporting this. + + * examples/Configuration: Updated this example to include the new + test for the ACE_Configuration_Heap methods. Thanks to Michael + Searles <msearles@base16.com> for contributing this. + +Thu Jan 18 18:55:37 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/nightlybuilds/builds.lst: + Add the RedHat_Implicit_Templates build. + +Thu Jan 18 18:48:33 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/Log_Msg.cpp: + Declare sys_nerr as const int under QNX/RTP (and NTO). + + * ace/Pipe.cpp: + Use pipe() under QNX because it lacks both socketpair() and it + cannot open a socket to itself. + + * ace/config-qnx-rtp.h: + Remove ACE_NTRACE hacks. + + * include/makeinclude/platform_qnx_rtp_gcc.GNU: + Do not enable the repo by default it breaks QNX. + Instead of removing the definition of DCFLAGS by default we + set debug=0 all the time, that seems like a cleaner way to + disable debugging. + +Thu Jan 18 09:34:35 2001 Carlos O'Ryan <coryan@uci.edu> + + * include/makeinclude/platform_linux.GNU: + The -fno-implicit-templates flag was hardcoded, but this gave + the users no recourse to remove should they want to use + -fimplicit-templates. + The macro IMPLICIT_TEMPLATES_FLAG is used to set the flag now, + unless the user provides a value for the macro the makefiles + continue to work as they did before this change, i.e., adding + -fno-implicit-templates to CCFLAGS. + Notice that this functionality was available in + platform_linux_lxpthreads.GNU, but dissapeared when everything + was rolled into platform_linux.GNU. + +Thu Jan 18 06:26:42 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Configuration.{h,cpp}: Added functionality to read in all + values in a config file without requiring a type prefix on each + value, skips whitespace and allows comments on the end of lines. + Thanks to Michael Searles <msearles@base16.com> for contributing + this. + +Wed Jan 17 11:48:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/msvc_auto_compile.pl: + + Added PACE to the list of ACE directories so PACE is + compiled in full auto builds. + +Wed Jan 17 10:00:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/Handle_Ops.cpp: (handle_timed_open) + + Removed the use of ACE_NONBLOCK on Win32. This use + didn't function as expected, since ACE_NONBLOCK would + be interpreted as O_WRONLY. Also, the CreateFile API + call doesn't support any nonblocking option, so + redefining ACE_NONBLOCK would not seem to fix anything. + + Thanks to Matthias Wittig <m.wittig@com-on.de> for reporting + a problem report form about this. + + * bin/PerlACE/Process_Unix.pm: + + Fixed up the use of the RUNNING state, so wait and kill + work properly. Also made Kill automatically use waitpid + (since I can't think of any time we'd kill without wanting to + clean up the resources). + +Wed Jan 17 07:44:29 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (send): Set errno to + EWOULDBLOCK if n < len so that the caller will initiate a + handle_output()-driven reply. Thanks to Klaus H. Wolf + <hw@cyland.com> for reporting this. + + * ace/Log_Msg.h (ACE_Log_Msg): Clarified that only the current message + is stored in TSS. Thanks to Pierre Oberson + <oberson@nagra-kudelski.ch> for pointing out the need for this + clarification. + + * examples/Log_Msg/test_log_msg.cpp (main): Fixed the example by + adding ACE_Log_Msg::PROCESS so that the messages do not print + out (which is the correct behavior for this test). Thanks to + Mike Curtis <mccurry@my-deja.com> for reporting this. + * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (send): Set errno to + EWOULDBLOCK if n < len so that the caller will initiate a + handle_output()-driven reply. Thanks to Klaus H. Wolf + <hw@cyland.com> for reporting this. + + * ace/Log_Msg.h (ACE_Log_Msg): Clarified that only the current message + is stored in TSS. Thanks to Pierre Oberson + <oberson@nagra-kudelski.ch> for pointing out the need for this + clarification. + + * examples/Log_Msg/test_log_msg.cpp (main): Fixed the example by + adding ACE_Log_Msg::PROCESS so that the messages do not print + out (which is the correct behavior for this test). Thanks to + Mike Curtis <mccurry@my-deja.com> for reporting this. + +Tue Jan 16 15:28:22 2001 Carlos O'Ryan <coryan@uci.edu> + + * netsvcs/lib/Server_Logging_Handler_T.cpp: + The formal parameter names must match in the .h and .cpp file + to make Sun/CC 6.0 happy. + +Tue Jan 16 11:25:32 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Log_Msg.cpp (log): Convert strerror() text string to a + TCHAR so that this call will work correctly with Unicode. + Thanks to Matthias Wittig <m.wittig@com-on.de> for reporting + this. + +Tue Jan 16 09:58:20 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/ace_wchar.inl: + + Updated ACE_Ascii_To_Wide and ACE_Wide_To_Ascii to + preserve null pointers. + + Thanks to Matthias Wittig <m.wittig@com-on.de> for + reporting this and suggesting a fix. + +Tue Jan 16 10:47:33 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * ace/config-win32-common.h: + * ace/config-win32-msvc.h: + Moved #define ACE_HAS_LLSEEK from config-win32-common.h to + config-win32-msvc.h, since _lseeki64 isn't defined for + Borland. Also implicitly removed ACE_HAS_LLSEEK for the + VisualAge compiler - it might have worked (didn't know, + couldn't test) + +Mon Jan 15 15:22:42 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Asynch_IO.h: Changed the ACE_Asynch_Read_Stream::read() + method's "bytes_to_read" parameter to "num_bytes_to_read" to + workaround a weird problem with some compilers. Thanks to Chris + Kohlhoff <chris@kohlhoff.com> for this fix. + + * examples/Service_Configurator/IPC-tests/README: Updated this + file so that it's now up-to-date and also explains how to + reconfigure a server if SIGHUP isn't supported. Thanks to Mike + Curtis <mccurry@my-deja.com> for reporting this. + +Mon Jan 15 12:13:48 2001 Darrell Brunsch <brunsch@uci.edu> + + * bin/nightlybuilds/builds.lst: [Added] + * bin/nightlybuilds/scoreboard_update.pl: [Added] + + Moved the scoreboard stuff from the internal cvs repos + to this one, so it is easier for people to edit the + list. + +Mon Jan 15 12:29:53 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/config-macosx.h: Fixed typo so that ACE_HAS_CLOCK_GETTIME + is spelled correctly. Thanks to Mike Curtis + <mccurry@my-deja.com> for reporting this. + + * ace/Strategies_T.cpp (open): Replace the ACE_OS::strncpy() functions + with ACE_OS::strcpy() functions. Thanks to Ron Hashimshony + <Ron@bandwiz.com> for reporting this. + +Mon Jan 15 09:44:16 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/RMCast/Makefile: + Fixed Makefile to link the ACE library, otherwise we get + undefined symbols under certain platforms (AIX). Thanks to + Scott Bolin <scott.bolin@pgs.com> for pointing this out. + +Mon Jan 15 09:11:12 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/config-win32-common.h: Added support for ACE_HAS_LLSEEK, though + this should probably be changed to be compiled only on some + Win32 platforms. + + * ace/OS.{h,i}: Added support for ACE_OS::llseek() on Win32. Thanks + to Nick Lin <nicklin@vantech.com.tw> for contributing this. + + * ace/Log_Priority.h: Clarified the fact that we only use 12 bits + for ACE_Log_Priority. Thus, the remaining bits are available + for application use. Thanks to David Singer + <David_P_Singer@res.raytheon.com> for motivating this comment. + +Sun Jan 14 16:53:11 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Configuration.{h,cpp}: Fixed a memory leak that occurred + with transient heaps. Also added a list of current limitations + to import/export routine. Thanks to Chris Hafey + <chafey@stentor.com> for contributing this stuff. + +Fri Jan 12 20:46:05 2001 Angelo Corsaro <corsaro@cs.wustl.edu> + + * include/makeinclude/platform_qnx_rtp_gcc.GNU: + Platform macros needed to run ACE on QNX RTP. + + * ace/config-qnx-rtp.h: + Configuration file needed to run ACE on QNX RTP. + + * ACE-INSTALL.html: + Added documentation on how to install ACE on QNX RTP, + and the issue with the current version of QNX RTP. + + +Fri Jan 12 14:59:15 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/RMCast/RMCast_Fragment_Test.cpp: + Fixed conversion from 64-bit ulong to 32-bit ulong under some + VxWorks compilers where 64 bits are emulated. Thanks to Edwin + McKay <mckayea@betalasermike.com> for pointing this out. + +Fri Jan 12 07:18:16 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/OS.{h,i}: Moved some "using std::*" definitions from OS.i to + OS.h. Thanks to Mike Curtis <mccurry@my-deja.com> for reporting + this and to Christopher Kohlhoff <chris@kohlhoff.com> for + suggesting the fix. + +Fri Jan 12 15:34:28 2001 Steve Huston <shuston@riverace.com> + + * ace/Managed_Object.h: Added <TYPE> to the unimplemented operator= + declaration. Fixes compile w/ IBM C/C++ 3.6 on AIX. + +Fri Jan 12 07:59:19 2001 Joe Hoffert <joeh@cs.wustl.edu> + + * Makefile: + Add the PACE directory back into the build. PACE should + not generate any build failures for the platforms + currently supported. + +Wed Jan 10 23:30:21 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/FILE_Addr.cpp (set): Replace (sizeof this->filename_) + with (sizeof this->filename_ / sizeof (ACE_TCHAR)). Thanks to + Matthias Wittig <m.wittig@com-on.de> for reporting this. + +Tue Jan 9 07:27:19 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Containers_T.h: Clarified that the ACE_Ordered_Multiset class + allows duplicates. Thanks to Albert Wijna + <albert.wijnja@meco.nl> for clarifying this. + +Sat Jan 6 10:20:55 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/File_Lock.{h,inl}: Made the get_handle() method const. + Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for + reporting this. + + * ace/TP_Reactor.h: + * ace/Get_Opt.h: + * ace/Caching_Utility_T.h: Added "ACE_UNIMPLEMENTED_FUNC" macros + for all copy constructors and assignment operators. Thanks to + Johnny Willemsen <johnny.willemsen@meco.nl> for reporting this. + +Fri Jan 5 01:09:28 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * performance-tests/Misc/context_switch_time.cpp (get_options), + * performance-tests/Misc/preempt.cpp (open), + * examples/Reactor/Misc/pingpong.cpp (run_svc), + * examples/Reactor/Misc/notification.cpp (main), + * examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp (main), + * examples/Shared_Malloc/Options.cpp (print_usage_and_die), + * examples/Service_Configurator/IPC-tests/client/: Updated all + these programs so that don't abort via %a, but instead call + ACE_OS::exit(). Thanks to Mike Curtis <mccurry@my-deja.com> for + suggesting this. + + * apps/Gateway/Peer/Options.cpp (print_usage_and_die): Make sure to + actually *die* when we're done with this function! Thanks to + Mike Curtis <mccurry@my-deja.com> for suggesting this. + +Thu Jan 4 00:10:26 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Select_Reactor_T.i: The cancel_timer() method should return the + number of events canceled, rather than 0 or 1. Thanks to Joe + Guan <jguan@mistwireless.com> for reporting this and providing + the fix. + + * ace/Synch.h: Added an acquire (ACE_Time_Value &) method to ACE_Null_Mutex + so that this will work properly when + ACE_HAS_OPTIMIZED_MESSAGE_QUEUE is enabled. Thanks to Yuriy + Zaporozhets <zaz@internet-zahav.net> for reporting this. + +Wed Jan 3 23:00:52 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Lib_Find.cpp (ldfind), + * ace/Makefile.bor (CFLAGS), + * include/makeinclude/outputdir.bor (OBJDIR), + * ace/config-win32-msvc.h: Added support for the new ACE_LD_DECORATOR_STR + macro which is used to work around the fact that Borland + attaches a so-called "decorator suffix" to all library names. + Thanks to Chris Kohlhoff <chris@kohlhoff.com> for reporting + this. + + * ace/Lib_Find.h: Fixed a typo where ACE_LIB_FIND_H was misspelled. + Thanks to Chris Kohlhoff <chris@kohlhoff.com> for reporting + this. + + * ace/SOCK_Stream.i, + ace/MEM_Stream.i: Updated the calls to ACE_OS::shutdown() to use + the new macros described below! + + * ace/OS.h: Added better support for the ACE_OS::shutdown() second + parmeter in the form of new macros ACE_SHUTDOWN_READ, + ACE_SHUTDOWN_WRITE, and ACE_SHUTDOWN_BOTH. Thanks to Mike + Curtis <mccurry@my-deja.com> for suggesting this. + + * ace/SOCK_Stream.h: Clarified the role of the timeout parameters in + the various methods. Thanks to Allen Broadman + <broadmana@plural.com> for motivating this. + +Thu Jan 11 17:24:30 2001 Carlos O'Ryan <coryan@uci.edu> + + * Makefile: + Add new target 'Core' to quickly compile the basic ACE+TAO + components. + +Thu Jan 11 09:56:43 2001 Frank <fhunleth@cs.wustl.edu> + + * ACE version 5.1.12 released. + +Thu Jan 11 05:38:24 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/TP_Reactor.cpp: Reverted the change that was made for SPRO + 5.1 compilers. The change that was reverted is this + + Thu Jan 4 17:14:33 2001 Balachandran Natarajan + <bala@cs.wustl.edu> + + * ace/Handle_Set.cpp: Changed the macro + + ACE_DIV_BY_WORDSIZE(x) ((x) >> (ACE_Handle_Set::WORDSIZE)) to + + ACE_DIV_BY_WORDSIZE(x) ((x) >> ((int) + ACE_Handle_Set::WORDSIZE)). This seems to be a better + fix. Thanks to David Allen <dallen@storm.com> for suggesting + this. + +Tue Jan 9 09:53:53 2001 Carlos O'Ryan <coryan@uci.edu> + + * tests/MEM_Stream_Test.cpp: + Run the event loop for at most 1 minute. After that we know + that something is amiss with the client threads, and we should + exit. This fixes the deadlock problems we were seeing in the + nightly builds. + The real cause of the problem is something broken with the way + MEM_Addr objects compare local addresses, sometimes they fail to + compare equal. In the test this results in failed connections. + +Mon Jan 8 18:53:39 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> + + * examples/Map_Manager/test_hash_map_manager.cpp: + Removed template instantiations for + ACE_Guard<ACE_SYNCH_RW_MUTEX>, + ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>, and + ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> to fix linker + errors under Lynx_I386. + +Mon Jan 8 10:44:57 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS.h: + + Added some more protection (!VXWORKS) around the cuserid + inline statement since VXWORKS doesn't have cuserid. + +Mon Jan 08 10:04:55 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Thread_Manager.cpp (terminate): Reordered some statements so + we get the thread descriptor's log_msg pointer before we delete + the thread descriptor. Thanks to Tomer Amiaz + <Tomer@bandwiz.com> for reporting this. + +Sun Jan 7 16:51:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/ace_dll.dsp: + + Removed the PACE libraries from linking. We are going to come + up with a different solution for pace. + + * docs/run_test.txt: + + Changed the instructions a little to use PerlACE::LocalFile + for the server's IOR file. + +Sun Jan 7 08:59:09 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/DLL_Test.cpp: Added a message in a ACE_ERROR statement. + * tests/run_test.lst: Disabled MEM_Stream_Test in Linux. + +Thu Jan 4 17:14:33 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/TP_Reactor.cpp (dispatch_i): Eliminate a portion of the + code from SunCC5 builds. This piece of code was trying to set + things right when it sees all the masks clear and the <size_> + greater than zero. This seems to be creating problems with SunCC + 5 builds alone. Commenting out this piece for SunCC5 helps. This + should also be a work around for the bug #750 in bugzilla. + +Thu Jan 04 17:07:48 2001 Luther Baker <luther@cs.wustl.edu> + + * ace/ace_dll.dsp + + Consistent typography (win32 specific backslash). + +Thu Jan 4 15:34:14 2001 Luther J Baker <luther@cs.wustl.edu> + + * ace/ace_dll.dsp + + Added PACE library to the ACE DLL project file. + (also changed the library search path) + +Wed Jan 3 17:24:11 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS.h: + + Mistakenly changed the ace_timezone () method to use + timezone () instead of timezone. Changed back. + +Wed Jan 3 16:00:22 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/ACE.cpp + + Changed the types of day_of_week_name and month_name in + ACE::timestamp to ACE_TCHAR (since that was the data + being assigned to it and the type that is later expected). + This fixed errors in Win32's Unicode build. + +Wed Jan 3 15:44:31 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS.i: + + Removed ACE_TIMEZONE since we found another workaround for + platforms that define timezone () as a macro. + + * ace/OS.h: + * ace/OS.i: + + Moved much of the code from ACE_OS::timezone and + ACE_OS::difftime into ace_timezone and ace_difftime. Since + some platforms don't have timezone or difftime, we needed + to do something here so those methods aren't used. Instead + of figuring out what larger #if !... should be, it is easier + (and less error prone) to just move the code here. + +Wed Jan 3 13:10:39 2001 Darrell Brunsch <brunsch@uci.edu> + + * apps/JAWS/server/HTTP_Helpers.cpp: + + Added ACE_MT around an ACE_Guard to remove an unused var + warning in the single threaded builds. + +Wed Jan 3 12:56:13 2001 Darrell Brunsch <brunsch@uci.edu> + + * ace/Timer_Wheel_T.cpp: + * ace/Timer_Wheel_T.h: + + Doug noticed some redundant code in expire while making his + change on the 21st. I checked and he was right, it looks like + I was moving around the loop termination conditionals and left + some around. Removed them and also added some better comments + and made it more doxygen complient. + +Wed Jan 3 12:06:20 2001 Darrell Brunsch <brunsch@uci.edu> + + * tests/Refcounted_Auto_Ptr_Test.dsw: + + Projects are listed in tests.dsw, so this is unneeded. + + * tests/tests.dsw: + + Added Refcounted_Auto_Ptr_Test.dsp. + +Tue Jan 3 10:30:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * docs/msvc_notes.txt: + + Added this file explaining some issues or explanations on how + ACE/TAO are set up for use with MSVC. Mainly I'm thinking of + this as a place to put random stuff about ACE and TAO on MSVC. + + Plus I think we need more nifty doxygen documents. ;-) A tip of + the hat goes to Letha Etzkorn <letzkorn@cs.uah.edu> and + Shivakumar Patil <shivakumar.patil@stdc.com> for bringing up + questions that led to the dump of info to this file. + + * ACE-INSTALL.html: + + Added a reference to msvc_notes.txt. + +Wed Jan 3 09:15:24 2001 Jeff Parsons <parsons@cs.wustl.edu> + + * ace/ACE.cpp: + + Replaced these lines + + SYSTEMTIME local; + ::GetLocalTime (&local); + + in the timestamp() method. + They were removed the last time this file was + modified, breaking the Win32 builds. + +Wed Jan 03 05:49:11 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.h: + The ace_cuserid() helper cannot be defined in Win32 + +Wed Jan 03 05:42:20 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.h: + Remove broken #include of unistd.h, it was a debug statement + that sneaked through the commit. + +Tue Jan 2 18:33:03 2001 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.h: + * ace/OS.i: + Workaround platforms that define timezone, difftime or cuserid + as macros. Instead of just dropping support for the ACE_OS::XXX + method we create an inline ace_XXX() function, that uses the + original macro expansion, then we #undef the offending macro, + and use the inline function in the code. + + * ace/config-tru64.h: + Enable cuserid() again, with the new workaround it should work + without problems. + This fix should remove some of the redness in the TRU64_CXX + builds. + +Tue Jan 2 14:22:21 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Add the DII version of Param_Test to the nightly builds. + +Tue Jan 2 10:25:30 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Cached_Connect_Strategy_T.cpp: Added the patch provided by + Edan Ayal <edan@bandwiz.com> for + ACE_Bounded_Cached_Connect_Strategy::find_or_create_svc_handler_i (). + +Tue Jan 2 09:03:18 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Asynch_Acceptor.{h,cpp}, + ace/POSIX_Async_IO.{h,cpp}, + ace/POSIX_Proactor.{h,cpp}, + ace/SUN_Proactor.{h,cpp}: Added enhanced versions of ACE_POSIX_Proactor + and ACE_SUN_Proactor to fix various problems uncovered and fixed by + Alexander Libman <Alibman@baltimore.com>. + + * ace/ACE.{h,cpp}: Fixed the timestamp() method so that it works + identically on Win32 and on UNIX. Also provided a new option + that'll make it possible to return a pointer to the beginning of + the time portion of "date and time." Thanks to Michael Searles + <msearles@base16.com> for contributing these fixes. + +Mon Jan 01 16:35:00 2000 Michael Kircher <Micahel.Kircher@mchp.siemens.de> + + * tests/Reader_Writer_Test.cpp: Added a #ifdef to check for native + RW lock support. If the platform supports native RW locks we should + not report a failure on upgrading, because native RW locks do not + support upgrading, only our RW lock emulation does this. + Thanks to Frank and Doug for pointing out this failure. + +Sun Dec 31 14:12:08 2000 Ossama Othman <ossama@uci.edu> + + * bin/auto_run_tests.lst: + + Added TAO's "ForwardRequest" PortableInterceptor test to the + list of tests to run. + +Sun Dec 31 13:59:02 2000 David L. Levine <levine@cs.wustl.edu> + + * tests/Refcounted_Auto_Ptr_Test.cpp: on DIGITAL_UNIX + only, added a call to ACE_OS::exit () at the end of + the test so that it will terminate. [Bug 758] + +Sun Dec 31 10:28:43 2000 David L. Levine <levine@cs.wustl.edu> + + * include/makeinclude/platform_osf1_4.0.GNU (LIBS): + wrapped /usr/lib/cmplrs/cxx/libcxxstd.a with + $(wildcard), so that is ignored on systems on which + it doesn't exist, such as Tru64 5.1. + +Sun Dec 31 09:23:09 2000 David L. Levine <levine@cs.wustl.edu> + + * include/makeinclude/platform_tru64_cxx.GNU: added + support for Tru64 5.1 (DIGITAL_UNIX 0x510). + + * ace/config-tru64.h: added ACE_LACKS_CUSERID with + DIGITAL_UNIX >= 0x510, because cuserid () is a macro + in Tru64 5.1. + + Thanks to Carlos for tracking down this source of compilation + failure. + +Sat Dec 30 16:21:49 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Hash_Map_Manager_T.h: + * ace/Map_T.i: Fixed errors in g++ that were introduced while + applying the patches. + +Sat Dec 30 15:10:00 2000 Chris Gill <cdgill@cs.wustl.edu> + + * ace/RB_Tree.{cpp, h, i}: + tests/RB_Tree_Test.cpp: Fixed a bug in RB_delete_fixup that + occurs when the pointer to be fixed up is zero - solution is to + pass in a pointer to its parent, and maintain the parent pointer + and fixup pointer in tandem during the fixup function. Also + added a few functions to test the red-black invariant(s) at each + node of the tree, and added an invariant test call after each + bind and unbind in a new stress test in RB_Tree_Test.cpp. + + Thanks to Klaus H. Wolf <hw@cyland.com> for pointing out the + problem and for contributing the stress test (which in a + slightly modified form is now part of the RB_Tree_Test.cpp code) + that reproduced the problem. + +Sat Dec 30 11:12:08 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Hash_Map_Manager_T.h: + * ace/Map_T.i: + * ace/Message_Block_T.cpp: Added patches provided by J. Russell + Noseworthy <rnosewor@objectsciences.com> for SPRO 5.1. The patch + to config-sunos-5.5.h has not been applied as it breaks builds + on SunCC 5.0. + +Fri Dec 29 17:08:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/auto_compile: + + Added a -sendreport option to enable the sending of email at all. + Now by default it will not. + +Fri Dec 29 16:53:22 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp (main), + * performance-tests/TTCP/C/new-ttcp.cpp (main), + * tests/Conn_Test.cpp: Incorrect use of %r, which caused + problems... Thanks to Mike Curtis <mccurry@my-deja.com> for + pointing this out. + +Fri Dec 29 14:21:01 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_SAP.cpp: Fixed incorrect ACE_RCSID identifier. Thanks + to Jerry Odenwelder <jerryo@atl.fundtech.com> for noticing this. + +Thu Dec 28 16:02:51 2000 Carlos O'Ryan <coryan@uci.edu> + + * bin/sandbox.cpp: + This program executes a child process (and its children), in a + new session and process group. If the process tree does not + finish before a given timeout (the first argument) the whole + tree is terminated. + The program is useful for test scripts and programs, + occasionally they hang the whole auto build. + + * bin/auto_compile: + Add new options '-sandbox' and '-sandbox_timeout' to support the + sandbox program. + +Thu Dec 28 16:10:59 2000 Frank Hunleth <fhunleth@cs.wustl.edu> + + * performance-tests/UDP/udp_test.cpp: + * performance-tests/Server_Concurrency/Latency_Stats.h: + * performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp + * performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp + Fixed compile problems under VxWorks when handling + 64 bit integers. Basically, truncated the 64 bit integers + to 32 bit integers for operations not supported by + ACE_U_LongLong. + +Wed Dec 27 15:32:43 2000 Frank Hunleth <fhunleth@cs.wustl.edu> + + * examples/Reactor/WFMO_Reactor/test_network_events.cpp: + Added missing ; + +Wed Dec 27 11:11:02 2000 Carlos O'Ryan <coryan@uci.edu> + + * examples/Map_Manager/test_hash_map_manager.cpp: + * examples/Misc/test_trace.cpp: + * performance-tests/Misc/test_singleton.h: + * performance-tests/Misc/test_singleton.cpp: + Fixed problems in single threaded builds, basically I use the + ACE_SYNCH_* macros instead of using the class directly. + +Tue Dec 26 18:53:06 2000 Carlos O'Ryan <coryan@uci.edu> + + * performance-tests/Server_Concurrency/Makefile: + The tests make no sense if threads are disabled, so they are not + compiled under that configuration. + +Tue Dec 26 18:31:08 2000 Carlos O'Ryan <coryan@uci.edu> + + * examples/Naming/test_open.cpp: + Fixed compilation problems under Sun/CC 4.2, the Log_Msg.h file + was not #included + +Tue Dec 26 14:45:50 2000 Ossama Othman <ossama@uci.edu> + + * bin/auto_run_tests.lst: + + Added TAO's "Dynamic" and "IORInterceptor" PortableInterceptor + tests to the list of tests to run. + +Tue Dec 26 11:49:49 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * examples/IPC_SAP/SPIPE_SAP/server.cpp: Fixed a statement not + reachable warning on KCC. + +Sat Dec 23 18:11:02 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/SString.cpp: Enhanced the implementation so that it works + correctly when binary data (i.e., data that may contain NUL + characters) is stored in a string. Thanks to Michael Lindner + <mikel@att.net> for reporting this. + +Fri Dec 22 15:18:49 2000 Steve Huston <shuston@riverace.com> + + * ace/ace-dll.icc: Added Basic_Stats.{h cpp} to build clean. + +Fri Dec 22 14:00:41 2000 Steve Huston <shuston@riverace.com> + + * ace/config-all.h: On HP-UX 11, when figuring ACE_bad_alloc exception + class, account for older compilers that don't define __HP_aCC. + +Fri Dec 22 12:56:06 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/ACE.cpp (process_active): Call CloseHandle before return to + avoid handle leaks on Win32. Thanks to Arnaud Compan + <compan@ipanematech.com> for the fix. + +Fri Dec 22 13:04:58 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * bin/run_all_list.pm: Added the bidirectional test to the list. + +Fri Dec 22 12:43:54 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/OS.h: Fixed a typo. + +Fri Dec 22 09:12:37 2000 Steve Huston <shuston@riverace.com> + + * ace/OS.h: ACE_DEFAULT_FILE_PERMS - added FILE_SHARE_DELETE to the + bits if building on Win NT4 or greater. Thanks to Nanbor Wang + for calling attention to this. + +Fri Dec 22 08:06:10 2000 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * tests/Refcounted_Auto_Ptr_Test.cpp: Fixed the problem with an + undefined ACE_Auto_Basic_Ptr<Scheduler> by adding an explicit + template instantiation. Thanks to Frank A. Hunleth + <fhunleth@cs.wustl.edu> for reporting this. + +Thu Dec 21 18:12:38 2000 Steve Huston <shuston@riverace.com> + + * ace/ace-dll.icc, ace-lib.icc: Added OS_Errno.(cpp h) to the files + list. Thanks to Jerry Odenwelder for pointing out the need for these. + +Thu Dec 21 16:45:28 2000 Steve Huston <shuston@riverace.com> + + * tests/Capabilities_Test.cpp: Added missing \n to a ACE_ERROR + statement, and added ACE_DEFAULT_FILE_PERMS to the ACE_OS::open + call to create the test file. It used to be 0600, but that was + removed to satisfy Win32 which now pays attention to that arg. + +Thu Dec 21 05:50:51 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Timer_Wheel_T.cpp (expire): Fixed a mistake where + next_earliest_time should have been next_earliest. Thanks to + Keith Brown <kalbrown@ix.netcom.com> for reporting this. + + * examples/IPC_SAP/SOCK_SAP/Makefile.bor: Reenable CPP-inserver-fancy.cpp + now that it compiles! Thanks to Johnny Willemsen + <johnny.willemsen@meco.nl> for confirming this. + + * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp (handle_events): Added + casts for (SOCKET) when using FD_SET to work around problems + with Borland. Thanks to Johnny Willemsen + <johnny.willemsen@meco.nl> for reporting this. + + * ace/Message_Block.h (ACE_Dynamic_Message_Strategy): Fixed a bunch + of non-const accessor methods to be const. Thanks to Johnny + Willemsen <johnny.willemsen@meco.nl> for reporting this. + + * examples/Naming/Makefile (BIN2): Added the test_open.cpp file + to the Makefile. Thanks to Johnny Willemsen + <johnny.willemsen@meco.nl> for reporting this. + + * docs/tutorials/016/page02.html: Clarify that signal() or + broadcast() don't release the mutex. Thanks to Mike Curtis + <mccurry@my-deja.com> for pointing this out. + +Wed Dec 20 19:44:16 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * examples/Reactor/WFMO_Reactor/test_abandoned.cpp, + * examples/Reactor/WFMO_Reactor/test_directory_changes.cpp, + * examples/Reactor/WFMO_Reactor/test_network_events.cpp, + * examples/Reactor/WFMO_Reactor/test_prerun_state_changes.cpp, + * examples/Reactor/WFMO_Reactor/test_registration.cpp, + * examples/Reactor/WFMO_Reactor/test_registry_changes.cpp, + * examples/Reactor/WFMO_Reactor/test_talker.cpp, + * examples/Reactor/WFMO_Reactor/test_window_messages.cpp: + + * ace/Sock_Connect.cpp: The ACE 5.1.11 implementation of + ACE_Sock_Connect::get_ip_interfaces() fails when run on Windows + 2000 when ACE_HAS_WINSOCK2 = 0. This is because + get_ip_interfaces() checks the registry for the available + interfaces and fails when it encounters a new entry in windows + 2000 named "Device\NDisWanIP". The patch is to ignore invalid + devices and continue checking. Thanks to Chris Hafey + <chris@stentorsoft.com> for contributing this fix. + +Wed Dec 20 15:57:32 2000 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/RMCast/RMCast_IO_UDP.cpp + * ace/RMCast?RMCast_IO_UDP.h + * ace/RMCast/RMCast_IO_UDP.i : cleaned up tabs and trailing ws from + last submission... + +Wed Dec 20 16:18:49 2000 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/simple_test_proactor.cpp: Removed unused + 'initial_read_size' variable from file scope. + + * examples/Reactor/Proactor/test_aiosig_ace.cpp (setup_signal_handler): + * examples/Reactor/Proactor/post_completions.cpp: + * examples/Reactor/Proactor/test_end_event_loop.cpp: + * examples/Reactor/Proactor/test_cancel.cpp (Receiver::open): + Fixed unused variable warnings for gcc. + +Wed Dec 20 15:42:36 2000 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/RMCast/RMCast_IO_UDP.cpp + * ace/RMCast?RMCast_IO_UDP.h + * ace/RMCast/RMCast_IO_UDP.i : The g++ cross compiler 2.9-gnupro-98r2 + for target Lynx 3.0.1 host Solaris 2.6 was breaking with an internal + error at the end of handle_input(). Replacing a couple of lines of + code with the private, inline method allocate_and_bind_proxy() gets + around the problem. + +Wed Dec 20 15:32:44 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * examples/Threads/wfmo.cpp: Move the function calls etc. out of + the ACE_ASSERT() macros. Thanks to Mike Curtis + <mccurry@my-deja.com> for pointing this out. + +Tue Dec 19 15:08:40 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Logging_Strategy.cpp: If ACE_LACKS_IOSTREAM_TOTALLY we'll + use a "regular" file. Thanks to Sangwoo Jin for contributing + this fix. + + * ace/Mem_Map.cpp (map_it): In using ACE_Mem_Map, if the + ACE_Mam_Map::map's <offset> parameter is set to non-zero and the + <len> parameter is set to -1 then the right value to map should + be <mapped file size> - offset. Thanks to Sangwoo Jin for + reporting this and suggesting the fix! + + * ace/INET_Addr.{h,i}: Make operator < const. Thanks to + Michael Lindner <mikel@att.net> for reporting this. + +Tue Dec 19 18:39:27 2000 Luther J Baker <luther@cs.wustl.edu> + + * ace/WFMO_Reactor.cpp (simple_dispatch_handler): + + When ACE_HAS_PACE on NT, ACE must use pace_siginfo_t instead + of creating and using its own. The ACE version of siginfo_t + happens to use constructors and so, the code that uses + this ACE siginfor_t instantiates the struct via a constructor. + When ACE_HAS_PACE, the pace_siginfo_t cannot be instantiated + via constructor. + + My edit just chooses the correct method of instantiation + based on ACE_HAS_PACE. + +Tue Dec 19 18:21:52 2000 Luther J Baker <luther@cs.wustl.edu> + + * ace/Thread.h (ACE_Thread): + + Removed the default value on the overriden join (...) + function that took three parameters. + +Tue Dec 19 14:50:38 2000 Steve Huston <shuston@riverace.com> + + * ace/OS.h: If on ACE_WIN32, set ACE_DEFAULT_FILE_PERMS to + (FILE_SHARE_READ | FILE_SHARE_WRITE), not 0666. + +Tue Dec 19 14:40:26 2000 Steve Huston <shuston@riverace.com> + + * ace/Filecache.cpp: Changed definition of R_MASK and W_MASK to + 0 for ACE_WIN32; used to be for __BORLANDC__. This is related + to the change below because the third arg to ACE_OS::open is + not ignored any longer for Win32. + + * tests/Capabilities_Test.cpp: On ACE_OS::open, don't supply a + <perms> arg - let it default. The file gets deleted at the end of + the test and has nothing to be protected. Related to the below + change as well. + + * tests/Mem_Map_Test.cpp: Changed all the 0666 args to ACE_OS::open + to ACE_DEFAULT_FILE_PERMS. + +Tue Dec 19 11:02:41 2000 Steve Huston <shuston@riverace.com> + + * ace/OS.{h cpp} (open(char), open(wchar)): Changed the <perms> + argument to be used in the CreateFile call on Win32. Made the + default value of the argument match the old behavior (defaults + to FILE_SHARE_READ | FILE_SHARE_WRITE (and FILE_SHARE_DELETE on + NT4 and Win2K)). Thanks to Edan Ayal <edana@bandwiz.com> for this + suggestion! + +Mon Dec 18 20:47:40 2000 Ossama Othman <ossama@uci.edu> + + * ace/POSIX_Asynch_IO.h: + + Reverted previous change. It introduced compile-time errors. + +Mon Dec 18 19:07:31 2000 Steve Huston <shuston@riverace.com> + + * ace/Asynch_IO.h, ace/POSIX_Asynch_IO.h: Clarified/corrected some + comments regarding the write() operation getting its data from + the message block's rd_ptr. + +Mon Dec 18 11:44:11 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * tests/MEM_Stream_Test.cpp (connect_client): Fixed an unused + argument warning on KCC compiler. + +Mon Dec 18 11:00:14 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * tests/MEM_Stream_Test.cpp: Fixed problems when threads are not + supported and when explicit template instantiation is required. + +Sun Dec 17 20:11:08 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * tests/MEM_Stream_Test.cpp: + * tests/MEM_Stream_Test.dsp: + * tests/Makefile: + * tests/Makefile.am: + * tests/Makefile.bor: + * tests/run_test.lst: + * tests/run_tests.bat: + * tests/run_tests.lst: + * tests/run_tests.psosim: + * tests/tests.dsw: + * tests/version_tests/MEM_Stream_Test.dsp: + * tests/version_tests/version_tests.dsw: Added a new + MEM_Stream_Test. + +Sun Dec 17 19:32:58 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Malloc_T.cpp (shared_malloc): After a win32 structural + exception occurs, we need to re-execution the expression that + causes the exception. Thanks to Roger Beck + <roger_beck@royalsun.com.au> for reporting this. + + * ace/MEM_IO.i (fetch_recv_buf, recv): Differentiate the + cases of end of message and errors. + + * ace/Malloc_T.h: + * ace/Malloc_T.i: Added a base_addr method to return the base + address of the ACE_Malloc so we don't have to depend on MMAP's + base_addr method. + + * ace/MEM_SAP.i (set_buf_len,get_buf_len): Changed to computer + buffer location using the base_addr method in ACE_Malloc as the + one in Memory_Pool only indicates the fixed based addr. + + * ace/MEM_Acceptor.i: + * ace/MEM_Acceptor.h: Added a method to set the prefix of MMAP + filename. + + * ace/MEM_Acceptor.cpp (ACE_MEM_Acceptor): + * ace/MEM_Connector.cpp (ACE_MEM_Connector): Changed to MMAP + Options to allow MMAP files to be mapped at any address. + +Sun Dec 17 18:42:13 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Refcounted_Auto_Ptr.h: Need to add "ace/Auto_Ptr.h" here to + get the definition of ACE_Basic_Auto_Ptr. + + * tests: Added the Refcounted_Auto_Ptr_Test.cpp, which tests + the new ACE_Refcounted_Auto_Ptr class. Thanks to Johnny Tucker + <JTucker@infoglide.com> for contributing this. + + * tests/Refcounted_Auto_Ptr_Test.dsp, + tests/Refcounted_Auto_Ptr_Test.dsw + tests/Refcounted_Auto_Ptr_Test.icc: Added the projects to + compile the Refcounted_Auto_Ptr_Test.cpp. + + * tests/Makefile, + * tests/run_test.lst, + * tests/run_tests.lst: Added the Refcounted_Auto_Ptr_Test. + +Sun Dec 17 11:00:47 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Date_Time.i (update): Fixed a typo. + +Sun Dec 17 08:52:04 2000 Carlos O'Ryan <coryan@uci.edu> + + * etc/tao_smartproxies.doxygen: + This file was left out from a previous commit. + +Sat Dec 16 09:36:56 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Date_Time: Added a new method update() to reset the current + date/time and also added a new constructor that calls update() + to initialize an ACE_Date_Time implicitly, rather than having to + pass all the values into the constructor. Thanks to Jerry + Odenwelder <jerryo@atl.fundtech.com> for contributing this. + +Fri Dec 15 15:27:02 2000 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_compile: + * bin/make_pretty.pl: + The DU/CXX compiler has three levels, 'Error', 'Warning' and + 'Info:', the latter was being ignored. + +Fri Dec 15 14:36:33 2000 Christopher Kohlhoff <chris@kohlhoff.com> + + * include/makeinclude/clean.bor: + * include/makeinclude/recurse.bor: + + Added new 'realclean' target to Borland makefiles for + removing all generated files (both intermediate and final). + Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for + suggesting this. + +Fri Dec 15 14:32:06 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Log_Msg.h (ACE_Log_Msg): Changed the documentation + to reflect the fact that the %a option causes the program to + abort() rather than exit(). Thanks to Mike Curtis + <mccurry@my-deja.com> for pointing this out. + +Fri Dec 15 14:29:44 2000 Carlos O'Ryan <coryan@uci.edu> + + * bin/generate_doxygen.pl: + Generate documentation for the new TAO_SmartProxies library. + +Fri Dec 15 10:22:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/auto_run_tests.pl: + + Included PerlACE::Run_Test instead of ACEUtils and + ConfigList. + +Fri Dec 15 09:22:05 2000 Carlos O'Ryan <coryan@uci.edu> + + * examples/Connection/non_blocking/Makefile: + Fixed dependencies between the binaries and the library + generated in this directory, otherwise parallel builds can + fail. + +Thu Dec 14 10:36:45 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/auto_run_tests.lst: + * tests/run_test.lst: + + Converted to the new PerlACE::ConfigList style of .lst + files (can now say stuff like "Test: MSVC !Borland") + + * bin/auto_run_tests.pl: + * bin/auto_compile: + * tests/run_test.pl: + + Changed to use PerlACE::ConfigList. + + [Bug 729] + + * bin/ACEutils.pm: + + Made sure it would eat the -Config option so it will not + be a problem if old run_test.pl's don't get updated + immediately. + + * bin/msvc_auto_compile.pl: + + Added -d flag for debugging (just prints out what would be + compiled) + + * bin/fuzz.pl: + + Added a rudimentary run_test.pl out-of-date test. + +Thu Dec 14 10:20:49 2000 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_lynxos.GNU + Allow users to set the debug option without using + 'override debug='. debug=0 now works properly. + +Thu Dec 14 06:00:12 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace: Removed makefile-light since it's no longer needed. + Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for + reporting this. + +Wed Dec 13 18:33:19 2000 Carlos O'Ryan <coryan@uci.edu> + + * html/README: + Add README file explaining why the directory is empty and why + the index.html URLs don't work unless you download or generate + the Doxygen files. + + * html/index.html: + Add entry for the smart proxies library. + +Wed Dec 13 18:27:29 2000 Carlos O'Ryan <coryan@uci.edu> + + * THANKS: + Add 'Pedro Ferreira' to the hall of fame. + +Thu Dec 13 18:18:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/PerlACE/ConfigList.pm: (added) + * bin/PerlACE/Process.pm: (added) + * bin/PerlACE/Process_Unix.pm: (added) + * bin/PerlACE/Process_Win32.pm: (added) + * bin/PerlACE/Run_Test.pm: (added) + + These are a couple of Perl modules that will be used + to simplify current run_test.pl's and the auto_builds + and to allow us to run tests on Win32 for configurations + that output executables into subdirs (Win32 Release, + Win32 Static *, Borland). The conversion of scripts over + to the new style will occur in separate checkins. + + ConfigList provides a more powerful *.lst format for + specifying test lists. Process is a newer version of + the old bin/Process.pm that has a different interface + and a couple of extra methods for common tasks for + our scripts. And Run_Test.pm will replace the + bin/ACEutils.pm and be the main module for our + run_test.pl scripts. It contains some common subroutines + and automatically parses some arguments via ARGV. + + * docs/run_test.txt: (added) + + A bit of documentation on how new run_test.pl's will + look. + +Wed Dec 13 18:15:03 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/CDR_Stream.h: + Made some of the adjust() methods public, this is used to + optimize TAO's implementations of CORBA::Any. + +Wed Dec 13 12:59:49 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/PerlACE/Process_Unix.pm: + + Fixed PerlACE::Process on Unix to have the same interface as + the Win32 version. + +Tue Dec 12 09:52:00 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * Well, it looks like we finally have a new president in the + US, yow! + +Tue Dec 12 04:53:17 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Service_Config.{h,i}: Added an inequality operator. + Thanks to Mike Curtis <mccurry@my-deja.com> for pointing this + out. + + * ace/Service_Config.cpp (process_commandline_directives): Changed + a check for error values being -1 to being != 0 since process_directive() + can return + + 1) a positive number of parse errors + 2) and -1 on a certain ACE_NEW_RETURN call + 3) but always zero on success. + + Thanks to Mike Curtis <mccurry@my-deja.com> and + Munagala Ramanath <Munagala.Ramanath@PostX.com> + for pointing this out. + +Tue Dec 12 01:07:39 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/Log_Msg.cpp: + + Changed a comment to remove a false warning by fuzz. + +Mon Dec 11 15:10:00 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Get_Opt.h: + In some platforms 'optind', 'optarg' and 'opterr' are defined as + macros, undefine them because we use the same identifiers as + variable names. + + * ace/OS.h: + If 'timezone' is defined as a macro in the system header files + then define ACE_TIMEZONE and #undef timezone. + The ACE_OS::timezone() method cannot be compiled otherwise, but + unfortunately this forces us to disable support for the method + under that sort of platform. + + * ace/OS.h: + Do not include sys/shm.h if ACE_LACKS_SYSV_SHMEM is defined, + there is no reason to #include the file if we are not using it + anyway. + + * ace/ACE.cpp: + Check the return value from getrlimit() before accepting its + results. + +Mon Dec 11 00:50:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/ace_wchar.h: + + Created an ACE_ANTI_TCHAR and ACE_TEXT_ANTI_TO_TCHAR. + ACE_ANTI_TCHAR has the opposite behavior of ACE_TCHAR. + + * ace/Process.cpp: + * ace/Process.h: + * ace/Process.i: + + Added wchar_t versions of: + + - ACE_Process_Options::working_directory (wd) + - ACE_Process_Options::command_line (format, ...) + + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + + Added wchar_t versions of: + + - ACE_OS::cond_init () - 2 versions + - ACE_OS::mutex_init () + - ACE_OS::thread_mutex_init () + - ACE_OS::event_init () + - ACE_OS::sema_init () + + On Win32, these should be implemented using the *W version + of the APIs. On other platforms, they call the char version + of the same ACE_OS call with a converted string. + + * ace/Log_Msg.h: + * ace/Log_Msg.cpp: + + Changed the first parameter to set and conditional_set from + being ACE_TCHAR to just char. We'll assume filenames are + always ansi strings (since __FILE__ seems to act this way). + There was actually a dangling pointer problem in the + conditional_set when ACE_USES_WCHAR was defined before. + + Added an ANTI_TCHAR version of log (priority, format, ...). + What this means is now we can use either narrow or wide + format strings with Log_Msg, regardless of whether ACE_USES_WCHAR + is defined or not. Hopefully this means we can get rid of a lot + of the ACE_TEXT and ACE_LIB_TEXT's in our code. + + Added a couple of more specifiers, %C and %w. So for characters + and strings we have: + + %c : print out an ansi character + %C : print out an ansi string + %s : print out an ACE_TCHAR * string + %w : print out a wide character + %W : print out a wide string + + An example, which will also function correctly even when + ACE_USES_WCHAR is defined: + + void print (char *a_str, wchar_t *w_str, ACE_TCHAR *t_str) + { + ACE_DEBUG ((LM_DEBUG, + "%C %s %W\n", + a_str, + t_str, + w_str)); + } + + Unfortunately this only really takes care of the string + specifiers. There is still work to be done with the other + implicit string specifiers (%p, %N, etc.). + + * ace/RMCast/RMCast_IO_UDP.cpp: + * ace/RMCast/RMCast_Reassembly.cpp: + * ace/SSL/SSL_Context.cpp: + * ace/SSL/SSL_SOCK_Acceptor.cpp: + * ace/SSL/SSL_SOCK_Connector.cpp: + * ace/SSL/SSL_SOCK_Stream.i: + + Removed unnecessary ACE_TEXT's to see how things go. + + * docs/wchar.txt: + + Updated the documentation. + +Fri Dec 8 13:47:58 2000 Jeff Parsons <parsons@cs.wustl.edu> + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + + Added Refcounted_Auto_Ptr.{h,i} to these projects. + +Fri Dec 8 10:34:32 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Makefile: Added Refcounted_Auto_Ptr to the list of template + files. + + * ace/Auto_Ptr.{h,i}: + * ace/Refcounted_Auto_Ptr.{h,i}: Moved the new + ACE_Refcounted_Auto_Ptr into a separate file to reduce + unnecessarily coupling in ACE. Thanks to Darrell Brunsch for + pointing this out. + +Fri Dec 8 09:27:01 2000 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_chorus4.x_g++.GNU: + + Modified to build only static libraries. Something changed + between the time of the port and now, which caused it to try + to build shared libraries (which Chorus 4.0 doesn't support). + +Fri Dec 8 06:47:12 2000 Christopher Kohlhoff <chris@kohlhoff.com> + + * tests/Makefile.bor: + + Use variable called TARGET_NAME instead of NAME to + prevent clash with nightly build scripts. + +Thu Dec 7 13:16:23 2000 Darrell Brunsch <brunsch@uci.edu> + + * examples/IPC_SAP/SPIPE_SAP/server.cpp: + + Removed PERMS global variable, since it wasn't being + used (which KCC noticed). + + * examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp: + * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp: + * examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp: + * examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp: + + When calling ACE_OS::cuserid and passing a NULL pointer, it + should be cast to something like char * or wchar_t *. In + this case it should be a char *, so I added a + ACE_static_cast for it. + +Thu Dec 7 02:31:44 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/config-WinCE.h: + + Disabled inlining for SH3 Release configuration. The SH3 compiler + has problems with inlined functions (in this case, ACE_OS::dlerror's + static variable was staying unresolved). Thanks to Ricardo Chan + <ricchan@nortelnetworks.com> for pointing this out to me. + +Thu Dec 7 03:33:49 2000 Marina Spivak <marina@cs.wustl.edu> + + * bin/auto_run_tests.lst: + + Added RTCORBA MT test. + +Wed Dec 6 19:52:42 2000 Darrell Brunsch <brunsch@uci.edu> + + + * ace/Auto_Ptr.i: + + Added a couple of ACE_INLINEs and an include of Synch_T.h. + +Wed Dec 06 20:12:35 2000 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/Containers_T.cpp (operator=): In case the existing array is + larger than the rhs (right hand side), we don't have to free and + reallocate the existing array. However, we do need to run the + destructor on the array elements that will be replaced. Hence, + I added a call to ACE_DES_ARRAY_NOFREE for the elements being + replaced. + + This fixes bug 704. Thanks to Martin Krumpolec + <krumpo@pobox.sk> for reporting the bug and for providing an + example illustrating the problem. + +Wed Dec 6 14:29:13 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Auto_Ptr.{h,i}: Added a new set of class (ACE_Refcounted_Auto_Ptr_Rep, + ACE_Refcounted_Auto_Ptr) that implements support for a reference + counted auto_ptr. Thanks to Johnny Tucker + <JTucker@infoglide.com> for contributing this. + + * ace/Managed_Object.h: Added ACE_UNIMPLEMENTED_FUNC macros for + copy constructor and assignment operator in class + ACE_Cleanup_Adapter. Thanks to Johnny Willemsen + <johnny.willemsen@meco.nl> for reporting this. + + * tests/run_tests.sh: Prevent null or zero-length string test name from being + passed into the run() function. Thanks to Jon Loeliger + <jloeliger@chiaro.com> for reporting this. + + * tests/Log_Msg_Test.cpp, + * examples/Log_Msg/test_log_msg.cpp (main): + Replaced int with u_long to make compilers happy. Thanks to + Mike Curtis <mccurry@my-deja.com> for pointing this out. + +Tue Dec 5 11:45:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/SSL/SSL_SOCK_Acceptor.cpp: + + Added ACE_TEXT to a debug message. + +Tue Dec 5 10:07:14 2000 Carlos O'Ryan <coryan@uci.edu> + + * performance-tests/Misc/childbirth_time.cpp: + Use &function instead of just function, hopefully that will make + Sun/CC 5.0 happy. + +Tue Dec 5 09:38:22 2000 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): + + Return "-1" instead of the result of the + ACE_SSL_SOCK_Stream::close() method. The latter may actually, + and most likely will return without error. + +Tue Dec 05 05:39:39 2000 Christopher Kohlhoff <chris@kohlhoff.com> + + * tests/Makefile.bor: + + Implemented 'clean' support in the ACE tests makefile. + +Tue Dec 05 02:02:51 2000 Irfan Pyarali <irfan@cs.wustl.edu> + + * ace/IPC_SAP.cpp (disable): Reverted this change: + + Tue Nov 21 17:42:36 2000 Pradeep Gore <pradeep@cs.wustl.edu> + + The change seemed too low level where it might end up effecting + more code than was intended. However, as I discussed with Chris + Uzdavinis <chris@atdesk.com>, the correct solution is to + specialize the activation of the Svc_Handler rather than its + accepting. + +Mon Dec 04 23:54:10 2000 Irfan Pyarali <irfan@cs.wustl.edu> + + * examples/Reactor/Proactor/test_proactor.cpp: + + - Receiver::open(): Only duplicate the message block when we are + faking the result. Otherwise, initiate_read_stream will create + its own message block. + + - Receiver::open(): Delete the fake result. + + - Receiver::handle_read_stream(): When there is no more data to + read, release the message block and delete the receiver. + + - Sender::transmit_file(): No need to duplicate the trailer. + + * ace/Proactor.cpp (~ACE_Proactor_Timer_Handler): + + The following was changed: + + this->thr_mgr ()->wait (); + + to: + + this->thr_mgr ()->wait_grp (this->grp_id ()); + + since Thread_Manager::wait() if called while the + ACE_Object_Manager is shutting down (as a result of program + shutdown or ACE::fini), it will not wait for any threads to + complete. + + Also, the timer_handler thread was not created detached since + Thread_Manager::wait_grp() does not wait on detached threads. + +Mon Dec 04 16:32:11 2000 Ossama Othman <ossama@uci.edu> + + * ace/SSL/SSL_SOCK_Stream.i (recv): + + Shutdown the SSL connection if SSL_read() returns with an + SSL_ERROR_ZERO_RETURN OpenSSL error condition. + SSL_ERROR_ZERO_RETURN indicates that the peer is shutting down, + and that a "close_notify" message SSL message has been issued by + the peer. A "close_notify" message indicates that no further + data will be sent through the given connection, so there is no + need to keep the connection open. + + Removed SSL_ERROR_WANT_{WRITE,X509_LOOKUP} switch statement + cases. They are apparently not necessary when performing a SSL + read. + + (send): + + Removed SSL_ERROR_WANT_{READ,X509_LOOKUP} switch statement + cases. They are apparently not necessary when performing a SSL + write. + + * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): + + Check that the X.509 verification didn't fail. If the + verification failed then do not continue. + + * ace/SSL/SSL_Context.cpp: + * ace/SSL/SSL_SOCK_Connector.cpp: + * ace/SSL/SSL_SOCK_Stream.cpp: + + Added missing ACE_RCSID macros. + + * ace/SSL/SSL_Context.h: + * ace/SSL/SSL_SOCK.h + * ace/SSL/SSL_SOCK_Acceptor.h: + * ace/SSL/SSL_SOCK_Connector.h: + * ace/SSL/SSL_SOCK_Stream.h: + + Doxygenated these headers. + + * ace/SSL/SSL_Context.i: + * ace/SSL/SSL_SOCK.cpp: + + Cosmetic updates. + +Mon Dec 04 12:45:46 2000 Steve Huston <shuston@riverace.com> + + * ace/High_Res_Timer.cpp: Corrected some problems with Linux on + Pentium that were introduced by this: + Fri Nov 10 10:42:31 2000 Steve Huston <shuston@riverace.com> + + * ace/High_Res_Timer.cpp: Replaced all occurrences of + "defined (ACE_HAS_PENTIUM)" with "defined (ACE_WIN32)" since + there is nothing Pentium-specific any longer in the Win32 + sections. + + Thanks to David Levine and Carlos O'Ryan for weeding this bug out. + +Mon Dec 4 07:39:16 2000 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/Service_Configurator/IPC-tests/clients: + Added Borland C++ Builder specific makefile. + +Sun Dec 3 20:03:16 2000 Ossama Othman <ossama@uci.edu> + + * examples/Web_Crawler/Command_Processor.cpp: + + Removed duplicate template instantiations. Thanks to Paul Rubel + <prubel@bbn.com> for pointing out this bug, and for providing a + fix. + + * THANKS: + + Added Paul to the Hall-of-Fame. + +Sun Dec 3 15:23:50 2000 Carlos O'Ryan <coryan@uci.edu> + + * performance-tests/Misc/childbirth_time.cpp: + Use 'extern "C"' for the thread entry point, this should make + Sun/CC 5.0 (and other compilers) happy. + +Sun Dec 3 08:50:15 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/OS.i: Fixed a cut and paste error. This was from the BUG# + 734 in bugzilla. Thanks to Martin Krumpolec <krumpolec@pobox.sk> + for reporting this. + +Sat Dec 2 05:58:37 2000 Christopher Kohlhoff <chris@kohlhoff.com> + + * ace/config-win32-borland.h: + + Automatically define WIN32 macro if we are able to + determine that it is the target platform from pre- + defined compiler macros. + + * ace/Makefile.bor: + + Added missing template source file for install target. + +Sat Dec 2 00:19:38 2000 Marina Spivak <marina@cs.wustl.edu> + + * bin/auto_run_tests.lst: + + Added RTCORBA/Explicit_Binding test. + +Fri Dec 01 21:17:35 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Thread_Manager.cpp: + More ACE_LEGACY_MODE fixes. + +Fri Dec 1 13:49:36 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Log_Msg.cpp: + Fixed problems on non-legacy Win32 builds. + +Fri Dec 1 09:46:15 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Log_Msg.h: + * ace/Log_Msg.cpp: + The structured exception handler methods should show up on + ACE_LEGACY_MODE builds. Unfortunately, the change from + ACE_LATEST_AND_GRATEST to LEGACY_MODE didn't work here because + the LATEST_AND_GREATEST macro was misspelled. + +Fri Dec 1 09:30:08 2000 Carlos O'Ryan <coryan@uci.edu> + + * include/makeinclude/platform_linux.GNU: + Add support for wxWindows under linux. + +Fri Dec 1 10:56:42 2000 Jeff Parsons <parsons@cs.wustl.edu> + + * include/makeinclude/ace_flags.bor: + + Added definitions necessary for the new smart proxies + library and its Borland makefile. + +Fri Dec 01 09:21:31 2000 Steve Huston <shuston@riverace.com> + + * ace/Reactor.h: Clarified some comments. + +Thu Nov 30 22:49:10 2000 pradeep@cs.wustl.edu <pradeep@cs.wustl.edu> + + * ACE version 5.1.11 released. + +Wed Nov 29 23:55:37 2000 Pradeep Gore <pradeep@cs.wustl.edu> + + * apps/drwho/server.cpp: + * apps/drwho/BS_Client.cpp: + Used casts to quiet VxWorks/LynxOS. + * bin/auto_run_tests.lst: + Commented out this test - its broken. + +Wed Nov 29 10:35:26 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp (parse_args): + Removed the colon after the "r" in the parse-args list. Thanks + to Mike Curtis <mccurry@my-deja.com> for pointing this out. + + * ace/Method_Request.h: Added ACE_UNIMPLEMENTED_FUNC to the + assignment operator and copy constructor of ACE_Method_Request. + Thanks to Johnny Willemsen <johnny.willemsen@meco.nl> for + pointing this out. + +Wed Nov 29 09:41:51 2000 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/Reactor/Multicast/*.bor + Added Borland C++ Builder specific makefiles. Thanks to + Albert Wijna <albert.wijnja@meco.nl> for creating these. + +Tue Nov 28 15:39:51 2000 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_compile: + Print out an error message when the script returns a non-zero + code. The errors where reported by email, but they didn't show + up in the make_pretty output. + +Tue Nov 28 15:36:10 2000 Carlos O'Ryan <coryan@uci.edu> + + * bin/generate_doxygen.pl: + Don't generate inline code for releases, it bloats the + documentation, and does not make things any clearer. + + * html/index.html: + Fixed URLs + + * etc/ace.doxygen: + * etc/ace_man.doxygen: + * etc/ace_rmcast.doxygen: + * etc/ace_ssl.doxygen: + * etc/tao_dynamicany.doxygen: + * etc/tao_dynamicinterface.doxygen: + * etc/tao_esf.doxygen: + * etc/tao_implrepo.doxygen: + * etc/tao_iormanip.doxygen: + * etc/tao_iortable.doxygen: + * etc/tao_portableserver.doxygen: + * etc/tao_rtevent.doxygen: + * etc/tao_strategies.doxygen: + Make sure that ACE_THROW_SPEC is properly defined. + + * etc/tao.doxygen: + Also fix the relative path to the ace doxygen files. + +Tue Nov 28 13:31:47 2000 David L. Levine <levine@cs.wustl.edu> + + * tests/run_test.pl: prefix exec of run_tests.sh with + $EXEPREFIX, so that it works without . in the user's + PATH. Thanks to Carlos for pointing this out. + +Tue Nov 28 08:09:35 2000 David L. Levine <levine@cs.wustl.edu> + + * tests/run_test.pl: added some more diagnostics to try + to figure out why run_tests.sh can't be exec'd on + UCI machines. + +Mon Nov 27 17:02:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ACE-INSTALL.html: + While following up on Johnny Willemsen's + <johnny.willemsen@meco.nl> suggestion to make sure I removed all + references to .mdp files, I noticed that some of the Win32 + instructions could use some updating. + +Mon Nov 27 17:44:52 2000 David L. Levine <levine@cs.wustl.edu> + + * tests/run_test.pl: if run_tests.sh doesn't exist, print + a diagnostic message and continue with the run_test.pl + version of the tests. For unknown reasons, this change: + Mon Nov 27 11:58:43 2000 David L. Levine <levine@cs.wustl.edu> + doesn't work on the UCI Linux machines, run_tests.sh can't + be exec'd. + +Mon Nov 27 10:17:58 2000 Ossama Othman <ossama@uci.edu> + + * docs/tutorials/005/005.dsp: + + Corrected name of output binary. It should have been + `server.exe' not `client.exe'. Thanks to David Channon + <djc@uq.net.au> for reporting this problem. + +Mon Nov 27 09:56:09 2000 Ossama Othman <ossama@uci.edu> + + The following updates are based on feedback from David Channon + <djc@uq.net.au>. Thanks David! + + * docs/tutorials/003/client.cpp: + * docs/tutorials/003/page01.html: + * docs/tutorials/004/client.cpp: + * docs/tutorials/004/page01.html: + * docs/tutorials/008/broadcast_client.cpp: + * docs/tutorials/008/directed_client.cpp: + * docs/tutorials/008/page02.html: + * docs/tutorials/008/page03.html: + * docs/tutorials/008/page04.html: + * docs/tutorials/008/server.cpp: + * docs/tutorials/009/broadcast_client.cpp: + * docs/tutorials/009/directed_client.cpp: + * docs/tutorials/009/page02.html: + * docs/tutorials/009/page03.html: + * docs/tutorials/009/page04.html: + * docs/tutorials/009/server.cpp: + * docs/tutorials/019/client.cpp: + * docs/tutorials/019/client2.cpp: + * docs/tutorials/019/page02.html: + * docs/tutorials/019/page03.html: + * docs/tutorials/019/page04.html: + * docs/tutorials/019/page05.html: + * docs/tutorials/019/server.cpp: + * docs/tutorials/019/server2.cpp: + * docs/tutorials/019/shmem.cpp: + * docs/tutorials/020/client.cpp: + * docs/tutorials/020/client2.cpp: + * docs/tutorials/020/mmap.cpp: + * docs/tutorials/020/page02.html: + * docs/tutorials/020/page03.html: + * docs/tutorials/020/page04.html: + * docs/tutorials/020/page05.html: + * docs/tutorials/020/server.cpp: + * docs/tutorials/020/server2.cpp: + + Include "ace/Log_Msg.h" to pull in the ACE_{DEBUG,ERROR} + macros. The example code in the HTML files was also updated. + + * docs/tutorials/011/message_queue.cpp: + * docs/tutorials/011/page02.html: + + Removed unnecessary line of code that NULL terminated a string. + It didn't serve any purpose since the string is already + terminated. If it wasn't terminated then that point in the code + would never have been reached since the code prior to it assumes + that the string is NULL terminated. + +Mon Nov 27 11:58:43 2000 David L. Levine <levine@cs.wustl.edu> + + * tests/run_test.pl: on platforms other than Win32, simply + exec run_tests.sh. run_tests.sh properly handles all of + the current ACE tests. [Bug 729] + +Mon Nov 27 14:12:09 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Activation_Queue.h: Added ACE_UNIMPLEMENTED_FUNC to the + assignment operator and copy constructor of + ACE_Activation_Queue. Thanks to Johnny Willemsen + <johnny.willemsen@meco.nl> for pointing this out. + +Sun Nov 26 19:07:48 2000 Pradeep Gore <pradeep@cs.wustl.edu> + + * examples/Map_Manager/test_hash_map_manager.cpp: + * examples/Shared_Malloc/Malloc.cpp: + * examples/Shared_Malloc/test_position_independent_malloc.cpp: + + Removed extraneous explicit template instantiation declarations + causing "multiply defined" errors on VxWorks and LynxOS. + +Sat Nov 25 22:08:46 2000 Pradeep Gore <pradeep@cs.wustl.edu> + + * apps/drwho/Makefile: + Disabled drwho compilation on Vxworks - it doesn't have + protocols/rwhod.h. + +Fri Nov 24 16:58:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/IPC_SAP.cpp: + + WSAEventSelect is not available on Windows CE, so the #ifdefs + were changed so it calls ioctl on Windows CE also. + +Fri Nov 24 15:43:20 2000 Carlos O'Ryan <coryan@uci.edu> + + * docs/ACE-categories.html: + Fixed URLs to Doxygen documents, I used the absolute URL to our + Doxygen site, but in the future we may want to do that + configurable. + + * bin/auto_run_tests.lst: + Disable the Connection_Purging test in TAO, it never worked and + the features are disabled while we continue to improve the + Connection Cache. + +Fri Nov 24 11:42:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ACE-INSTALL.html: + + Updated sections about Windows CE and MSVC. CE stuff + is documented in CE-status.txt, and removed references to old + MSVC 4.2 projects. Thanks to Johnny Willemsen + <johnny.willemsen@meco.nl> for pointing this out. + +Fri Nov 24 05:48:26 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Signal.h: Enhanced the documentation to clarify the role of + sigkey. Thanks to Oscar Rodriquez <Oscar.Rodriquez@eln.ericsson.se> + for motivating this. + + * ace/SOCK_Connector.h: Updated the documentation to clarify the + parameters to the constructors and the connect() method. Thanks + to Pierre Oberson <oberson@nagra-kudelski.ch> for suggesting this. + +Thu Nov 23 21:17:16 2000 David L. Levine <levine@cs.wustl.edu> + + * tests/Reactor_Notify_Test.cpp (main): added + auto_ptr<ACE_Reactor> so that the global Reactor instance + will be destroyed at the termination of main (). The cleans + up memory leaks that we introduced in this change to the test: + Tue Oct 24 12:30:47 2000 Steve Huston <shuston@riverace.com> + +Thu Nov 23 18:38:54 2000 Carlos O'Ryan <coryan@cs.wustl.edu> + + * Makefile: + Add ACE_wrappers/html to the list of files tagged, even though + they are not included in the tar or zip files. + +Thu Nov 23 18:13:32 2000 Carlos O'Ryan <coryan@cs.wustl.edu> + + Don't use 'grep -q' because Solaris' grep does not support it. + +Thu Nov 23 18:27:52 2000 Carlos O'Ryan <coryan@cs.wustl.edu> + + * Makefile: + The ACE-INSTALL file is generated in the staging directory, + there is no need to generate it locally too. + +Thu Nov 23 17:46:56 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Method_Request: Made the priority() method const. Thanks + to Johnny Willemsen <jwillemsen@remedy.nl> + +Thu Nov 23 14:43:40 2000 Carlos O'Ryan <coryan@uci.edu> + + * Makefile: + Do not include the html directory in the release. The doxygen + files are too big for this. + + * ace/config-doxygen.h: + Improve doxygen documentation. + + * bin/generate_doxygen.pl: + Add options to change the path to find dot and perl on the fly. + + * bin/make_release: + Generate the HTML documentation in a separate .tar.gz (or .zip) + file. + +Wed Nov 22 17:35:55 2000 Angelo Corsaro <corsaro@cs.wustl.edu> + + * bin/auto_run_tests.lst: + + Added entry for Collocation test. Moved entry for Client + Exposed Policy test from the old list file to this one. + +Wed Nov 22 09:29:32 2000 Darrell Brunsch <brunsch@uci.edu> + + * etc/ace.doxygen: + + Added the docs directory and *.txt files to be looked + at by doxygen. + + * docs/CE-status.txt: + * docs/wchar.txt: + + Fixed up these files, so they show up correctly in the + doxygen html pages. + +Tue Nov 21 19:55:49 200 0 Pradeep Gore <pradeep@cs.wustl.edu> + + * ace/IPC_SAP.cpp: + Casting param1 to SOCKET did the trick. Thanks Doug! + +Tue Nov 21 19:21:10 2000 Pradeep Gore <pradeep@cs.wustl.edu> + + * ace/IPC_SAP.cpp: + + Reverted previous change applied to ACE_IPC_SAP::disable because + of compile error. + +Tue Nov 21 18:54:14 2000 Pradeep Gore <pradeep@cs.wustl.edu> + + * apps/drwho/CM_Client.cpp: + + Explicitly cast Comm_Manager::sokfd_ to int in calls to + ACE_OS::recvfrom and ACE_OS::closesocket to quiet LynxOS. + +Tue Nov 21 17:42:36 2000 Pradeep Gore <pradeep@cs.wustl.edu> + + * ace/IPC_SAP.cpp: + + Modified ACE_IPC_SAP::disable to call ::WSAEventSelect on Win32. + Thanks to Chris Uzdavinis <chris@atdesk.com> for contributing + these changes. + +Tue Nov 21 11:00:14 2000 Darrell Brunsch <brunsch@uci.edu> + + * tests/run_test.lst: + + Borland shouldn't be running ACE_Init_Test. + +Tue Nov 21 10:15:15 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS_String.inl: + + Changed ::towlower to towlower since it can be a macro. + +Tue Nov 21 09:57:53 2000 Darrell Brunsch <brunsch@uci.edu> + + * tests/Reactor_Exceptions_Test.cpp: + + Code style fix. + + * tests/run_test.lst: + + New_Fail_Test just eats up memory when run, and it only tests + the behavior of new. Not really something we need to run + everynight (and as David Levine reports, using up all the + memory can cause problems in other processes on the nightly + build machines). Commented out the New_Fail_Test. + + * tests/run_test.pl: + + Fixed to clean up some of the backing_store_* files in the + tests directory after running the tests. + + * bin/ACEutils.pm: + + Added the ability to pick -ExeSubDir <dir> from the command + line to alter $EXEPREFIX. This should allow us to start + running tests with different configurations (ie. Win32 Release) + and on Borland. + +Tue Nov 21 07:24:54 2000 Chris Kohlhoff <chris@kohlhoff.com> + + * ace/SSL/Makefile.bor: + * include/makeinclude/build_dll.bor: + * include/makeinclude/build_exe.bor: + * include/makeinclude/build_lib.bor: + + Prevent SSL libraries from being built unless SSL_ROOT is defined. + + * include/makeinclude/build_example.bor: + + Add missing libraries required for statically linking TAO examples. + +Mon Nov 20 21:52:57 2000 Ossama Othman <ossama@uci.edu> + + * ace/Makefile.am: + + Added more missing files to the source lists. + +Mon Nov 20 19:16:12 2000 Ossama Othman <ossama@uci.edu> + + * ace/OS.i (mutex_init): + + Fixed an unused argument warning that was showing up in + ACE+Autoconf builds. + + * ace/Makefile.am (libACE_Utils_la_SOURCES): + + Updated "Init.cpp" to "Init_ACE.cpp." For some reason this + file wasn't updated when the name change was made. + + (libACE_Utils_la_SOURCES): + + Moved `Sock_Connect.cpp' to this list of sources. Similar to + the above change, this files wasn't updated when the + corresponding to changes was made to the classical Makefile. + +Mon Nov 20 15:00:26 2000 Marina Spivak <marina@cs.wustl.edu> + + * bin/auto_run_tests.lst: + + Added RTCORBA/Private_Connection, updated options for other + RTCORBA tests. + +Sun Nov 19 15:26:56 2000 Ossama Othman <ossama@uci.edu> + + * ace/SSL/sslconf.h + (ACE_DEFAULT_SSL_CERT_FILE, ACE_DEFAULT_SSL_CERT_DIR): + + On Win32, do not use UNIX-specific directories in certificate + paths. + +Sun Nov 19 10:37:48 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + Add the new files to the MSVC projects. + + * ace/Dynamic_Service_Base.h: + Add missing file. + + * ace/Dynamic_Service_Base.cpp: + Removed template-like protections, this is a regular class. + + * ace/Dynamic_Service.i: + * ace/Dynamic_Service.cpp: + Cosmetic fixes. + +Sun Nov 19 08:05:08 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * ace/Makefile: + Updated. + + * ace/Dynamic_Service.cpp: + * ace/Dynamic_Service.h: + * ace/Dynamic_Service_Base.cpp: + * ace/Dynamic_Service_Base.h: + Not all methods in Dynamic_Service were based on the SERVICE + types. Moved those to the base class 'Dynamic_Service_Base' and + the Dynamic_Service inherits from the base class. + +Sat Nov 18 15:39:49 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp: + Fixed a mistake in the "usage" string. Thanks to Mike Curtis + <mccurry@my-deja.com> for pointing this out. + +Sat Nov 18 11:35:53 2000 Darrell Brunsch <brunsch@uci.edu> + + * tests/OS_Test.cpp: + + Changed the signature of main to use ACE_TCHAR. Although + I don't consider this the "right" way of doing this, it + will make the builds happy with ACE_USES_WCHAR until we + implement something better. + +Sat Nov 18 09:58:17 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Basic_Types.h: + * ace/OS_Log_Msg_Attributes.h: + * ace/config-all.h: + Under LynxOS we must #include stdarg.h before stdio.h. + Thanks to David for letting us know about this. + +Fri Nov 17 14:24:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * include/makeinclude/clean.bor: + + Added the removal of *Cli.cpp, *Ser.cpp, etc. files which + is the output style of the TAO Param_Test. + + * tests/Reactor_Exceptions_Test.cpp: + + Put the handler in its own scope so it must be cleaned up + before the reactor. For whatever reason, it wasn't happening + in the right order on MSVC before. + + Also changed the exception error to a debug message, since + it really doesn't seem an error (we explicitly cause one). + +Fri Nov 17 11:22:08 2000 Carlos O'Ryan <coryan@uci.edu> + + * include/makeinclude/platform_sunos5_kcc.GNU: + Same fix as for platform_linux_kcc.GNU. + A little more detail has surfaced: apparently under this + compiler we attempted to link the static run-time and system + libraries if static_libs_only=1 was set. Not only this would be + unique (in that we don't do this for other compilers), but it + fails when only one directory is compiled with + static_libs_only=1, hile only the dynamic version of ACE (or any + other of our libraries) is compiled. + IMHO it is better to make it consistent with all the other + platforms, and leave the extra optimization of using static + system libraries for a future makefile option. + + * include/makeinclude/platform_linux_kcc.GNU: + Remove obsolete comment + +Fri Nov 17 03:37:37 2000 Marina Spivak <marina@cs.wustl.edu> + + * bin/auto_run_tests.lst: + + Added RTCORBA/Banded_Connections test. + +Fri Nov 17 01:16:25 2000 Ossama Othman <ossama@uci.edu> + + * include/makeinclude/wrapper_macros.GNU (ssl): + + Removed definition of the ACE_HAS_SSL macro. It is no longer + used. + +Thu Nov 16 16:14:03 2000 Carlos O'Ryan <coryan@uci.edu> + + * Makefile: + * html/doxygen.css: + * html/index.html: + New html directory. People normally don't expect html documents + to show up under the man directory. + + * configure.in: + * bin/bootstrap: + * man/Makefile.am: + * man/html/Makefile.am: + Remove the man/html directory. + + * bin/make_release: + Insert code to generate the man pages index. + + * docs/ACE-categories.html: + Change references to man/html so they point to the new doxygen + generated files. + + * bin/README.html: + * bin/class2hxxcxx: + * bin/class2hxxcxxsingle: + * bin/class2info: + * bin/class2info.awk: + * bin/class2man: + * bin/class2mml: + * bin/class2src: + * bin/classinfo.ps: + * bin/generate_html_windex: + * bin/generate_man_pages: + * bin/hiding.fmt: + * bin/html-windex: + * bin/info2doc.awk: + * bin/info2doc.fmt: + * bin/info2head: + * bin/info2head.fmt: + * bin/info2headsrc: + * bin/info2man: + * bin/info2mml: + * bin/info2src: + * bin/info2src.awk: + * bin/man2html: + * bin/man2html1.awk: + * bin/man2html2.awk: + * bin/vendor.fmt: + Remove old scripts used in man page and html document + generation. We do everything with doxygen now. + +Thu Nov 16 17:55:18 2000 Pradeep Gore <pradeep@cs.wustl.edu> + + * apps/JAWS/clients/Blobby/Blob.{h,cpp}: + * apps/JAWS/clients/Blobby/Blob_handler.{h,cpp}: + * apps/drwho/Rwho_DB_Manager.h: + * apps/drwho/Multicast_Manager.{.h,cpp}: + * apps/drwho/Options.{h,cpp}: + Follow const correctness to make suncc5 happy. + + * examples/IOStream/server/iostream_server.h + Use ACE_HAS_TEMPLATE_TYPEDEFS rather than ACE_HAS_TYPENAME_KEYWORD + Thanks to Steve Huston <shuston@riverace.com> for the fix. + +Thu Nov 16 15:31:20 2000 Carlos O'Ryan <coryan@uci.edu> + + * include/makeinclude/platform_linux_kcc.GNU: + Builds with static libraries under Linux/KCC were failing due to + some magical -Bstatic options in the configuration file. When + the options are removed the problem went away. + +Thu Nov 16 15:31:20 2000 Carlos O'Ryan <coryan@uci.edu> + + * include/makeinclude/platform_linux_kcc.GNU: + Builds with static libraries under Linux/KCC were failing due to + some magical -Bstatic options in the configuration file. When + the options are removed the problem went away. + +Thu Nov 16 15:09:25 2000 Carlos O'Ryan <coryan@uci.edu> + + * tests/TkReactor_Test.cpp: + Fixed 'char*' vs. 'const char *' conflict. + +Wed Nov 15 14:23:54 2000 Ossama Othman <ossama@uci.edu> + + * configure.in: + + Fixed bug in the auto_ptr / C++ std namespace test where the + template argument for the auto_ptr being instantiated was + a non-existent type. + Reported by Kevin Marhsall <KCMarshall@att.net> + + * THANKS: + + Added Kevin to the hall of fame list. + +Wed Nov 15 10:19:45 2000 Carlos O'Ryan <coryan@uci.edu> + + * examples/Threads/thread_specific.cpp: + Fixed warning under linux + +Wed Nov 15 08:32:58 2000 Carlos O'Ryan <coryan@uci.edu> + + * apps/JAWS/server/Makefile: + * performance-tests/Misc/Makefile: + Change dependencies to ensure that the libraries are created + before we attempt to link the binaries, otherwise the + compilation fails with parallel builds. + +Tue Nov 14 17:55:52 2000 Carlos O'Ryan <coryan@uci.edu> + + * Makefile: + PACE is disabled by default, unless pace=1 is set in the command + line or the platform_macros.GNU file. + +Tue Nov 14 19:36:47 2000 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/test_siosig_ace.cpp: Don't log + the read/written file using ACE_DEBUG - it will usually overflow + the ACE_Log_Record max message length and do bad things. + +Tue Nov 14 19:19:16 2000 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/simple_test_proactor.cpp: Don't log + the read/written file using ACE_DEBUG - it will usually overflow + the ACE_Log_Record max message length and do bad things. + Thanks to John Buckman <john@lyris.com> for reporting this. + +Tue Nov 14 18:43:51 2000 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/test_proactor3.cpp: Replace use of + list<Sender *> with Sender * [] so it builds without inifintely + complicated explicit instantiations on gcc. KISS ;-) + +Tue Nov 14 17:43:26 2000 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/test_aiocb_ace.cpp: Fixed to work + correctly if one of the aio ops completes, but not the other, + during a pass through the Test_Aio::do_aio loop. Thanks to + John Buckman <john@lyris.com> for reporting this. + +Tue Nov 14 14:19:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/Log_Record.cpp: + + In ACE_Log_Record::print, changed the call to ACE_OS::fprintf + to use ACE_TEXT("%s") as the second argument instead of just + "%s". This should make logging under ACE_USES_UNICODE readable. + Thanks to James Buck <jim@nowsol.com> and Nick Pratt + <npratt@microstrategy.com> for both reporting this problem and + submitting patches. + +Tue Nov 14 09:19:16 2000 Carlos O'Ryan <coryan@uci.edu> + + * examples/Threads/thread_specific.cpp: + Simply use %u to print an ACE_hthread_t. This is what we seem + to be doing in other places in the code. However, this seems to + be non-portable, the code in ACE_Log_Msg to print the thread ID + is a lot more complicated. + +Mon Nov 13 15:13:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/Object_Manager.cpp: + + Protected the assert dialog box disable with _MSC_VER + since it is only for MSVC. + +Mon Nov 13 03:46:21 2000 Darrell Brunsch <brunsch@uci.edu> + + * docs/CE-status.txt: + * docs/wchar.txt: (added) + + Updated documentation == good thing. + +Mon Nov 13 03:39:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/config-win32-borland.h: + + It looks like Borland also uses _wcsdup, so added the + ACE_WCSDUP_EQUIVALENT here. + +Mon Nov 13 01:07:36 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS_String.cpp: + * ace/config-win32-borland.h: + * ace/config-win32-msvc.h: + + Christopher Kohlhoff <chris@kohlhoff.com> mentioned to me + that Borland did have a wcsdup, but it was named differently + than the _wcsdup in MSVC. I took his suggestion and added + a ACE_WCSDUP_EQUIVALENT for MSVC's version and enabled + wcsdup for Borland's config. + +Mon Nov 13 00:36:29 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/Obstack.cpp: + * ace/Obstack.h: + + Nanbor mentioned to me the other day that the interfaces to + this class probably should remain as char *. After looking + at it, I agreed and changed it to that. But since Svc_Conf + uses this class in such a way that it is passing wchar_t + strings to it when ACE_USES_WCHAR is defined, I also added + a wchar_t version of copy to make things happy. + +Sun Nov 12 17:00:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/ace_ce.dsw: (removed) + * ace/ace_dll_ce.dsp: (removed) + * ace/ace.vcw: (added) + * ace/ace_dll.vcp: (added) + * ace/ace_os_dll.vcp: (added) + + Removed the old Windows CE project files, and replaced + them with ones created by the eMbedded Visual C++ from + MS. + + * ace/OS_Errno.cpp: (added) + * ace/OS_Errno.h: (added) + * ace/OS_Errno.inl: (added) + * ace/config-all.h: + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + + Moved the Errno stuff from ACE_OS to a separate class, + since it needed to be in its own layer for Windows CE. + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + * ace/Makefile: + * ace/Makefile.am: + * ace/Makefile.bor: + + Added OS_Errno.* files. + + * ace/ACE.cpp: + * ace/Sock_Connect.cpp: + + Moved get_reg_value () to Sock_Connect since that is where + it is being used. + + * ace/ARGV.cpp: + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + + Added ACE_LACKS_ENV for platforms (like Windows CE) which + doesn't have an environment. Maybe in the future this can + be emulated, for now, we do nothing. + + * ace/Base_Thread_Adapter.h: + * ace/OS.h: + + Replace ACE_Export with ACE_OS_Export. + + * ace/Base_Thread_Adapter.inl: + * ace/Thread_Adapter.inl: + + Moved some of the ACE_OS_Thread_Descriptor methods to + Base_Thread_Adapter, since they were declared in + Base_Thread_Adapter.h. + + * ace/SUN_Proactor.cpp: + + Removed ACE_BUILD_DLL from this file, since it should only + be defined in the project file. + + * ace/OS_Dirent.h: + + Added ACE_WINCE to the #if block around some of the includes. + + * ace/OS_Memory.h: + * ace/OS_Dirent.inl: + * ace/OS_String.inl: + * ace/OS.h: + + Added /**/ to the #includes of pace, since they seem to + totally confuse EVC's automatic dependency generation. + + * ace/OS_String.cpp: + * ace/OS_String.h: + * ace/OS_String.inl: + + Added strerror. On machines without it, just returns + "Unknown Error" all the time. + + Added strspn_emulation, strpbrk_emulation, strtol_emulation, + and strtoul_emulation. + + New compile time defines: + - ACE_LACKS_STERROR + - ACE_LACKS_STRPBRK + - ACE_LACKS_STRSPN + - ACE_LACKS_STRTOL + - ACE_LACKS_STRTOUL + - ACE_LACKS_STRTOD + + * ace/Log_Msg.cpp: + + Since there is now strerror in ACE, removed the !ACE_HAS_WINCE + blocks and replaced them with direct calls to ACE_OS_String's + version. + + * ace/config-win32.h: + + Changed check for #include-ing config-wince.h to be based on + _WIN32_WCE because this definition has been automatically added + to the default projects by the misc WinCE editors. + + * ace/Service_Config.i: + + The char versions of the following fuctions (which are defined + only under WinCE) were recursive and would fail miserably if + ever used. I added ACE_CHAR_TO_TCHAR to resolve the infinate + recursion. + - ACE_Service_Config::initialize () + - ACE_Service_Config::resume () + - ACE_Service_Config::suspend () + - ACE_Service_Config::remove () + + * ace/config-win32-msvc.h: + + We were defining ACE_HAS_GNU_CSTRING_H. I doubt that MSVC has + GNU's cstring.h, so I removed it. + + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + + Added ACE_LACKS_CUSERID and ACE_LACKS_CHDIR. + + Added writev and readv emulation methods to ACE_OS, since they + were just being defined as global functions. This is more + consistent with what we are doing elsewhere. + + Added ACE_LACKS_SYS_NERR emulation. + + * ace/config-WinCE.h: + + Added all the necessary defined to get ACE compiling for Windows + CE 3.0. As for previous versions, they do not currently compile, + although that could change in the future + +Sun Nov 12 12:29:31 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/Cache_Map_Manager_T.h: + * ace/Codeset_IBM1047.h: + * ace/Date_Time.h: + * ace/Dump_T.h: + * ace/Flag_Manip.h: + * ace/Hash_Cache_Map_Manager_T.h: + * ace/LSOCK_Acceptor.h: + * ace/Memory_Pool.h: + * ace/QoS_Decorator.h: + * ace/SV_Semaphore_Complex.h: + * ace/Strategies_T.h: + * ace/Synch_Options.h: + * ace/Time_Request_Reply.h: + * ace/Timer_Wheel_T.h: + * ace/WIN32_Proactor.h: + * ace/ace_wchar.h: + + Fixed @file comments. + +Sat Nov 11 18:55:04 2000 Pradeep Gore <pradeep@cs.wustl.edu> + + * ace/Profile_Timer.cpp: + Included Log_Msg.h to fix compile error. + +Fri Nov 10 19:41:38 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/fuzz.pl: + + Added a check for the @file comments used by doxygen. + They must be the same as the actual filename, or doxygen will + not pick up the comments for that file. + +Fri Nov 10 20:26:01 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Profile_Timer.cpp: Replaced ACE_OS::perror() with + ACE_ERROR macros so that the output can be redirected to the + same place that the ACE logging output is configured to go. + Thanks to Jeff Greif <jgreif@befree.com> for reporting this. + +Fri Nov 10 17:15:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/fuzz.pl: + + Made the output look a little closer to MSVC's. + +Fri Nov 10 17:08:52 2000 Carlos O'Ryan <coryan@uci.edu> + + * etc/tao_strategies.doxygen: + New doxygen configuration file for the TAO_Strategies library. + + * bin/generate_doxygen.pl: + Add tao_strategies.doxygen to the list. + + * etc/ace_man.doxygen: + Generate man pages in the man directory instead of doxygen_man. + +Fri Nov 10 12:58:53 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/generate_doxygen.pl: + * etc/tao_implrepo.doxygen: + + New Implementation Repository documentation. + +Fri Nov 10 12:53:28 2000 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_compile: + Format test output so make_pretty.pl can recognize where each + test starts. + + * etc/ace_rmcast.doxygen: + * etc/ace_ssl.doxygen: + * etc/tao.doxygen: + * etc/tao_dynamicany.doxygen: + * etc/tao_dynamicinterface.doxygen: + * etc/tao_esf.doxygen: + * etc/tao_iormanip.doxygen: + * etc/tao_iortable.doxygen: + * etc/tao_portableserver.doxygen: + * etc/tao_rtevent.doxygen: + Don't define the macros explicitly, use the config-doxygen.h + file. + Must define ACE_RCSID and ACE_UNDEFINED_FUNC properly, so + doxygen does not get confused. + +Fri Nov 10 14:26:41 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/config-sunos5.6.h: The AIO definitions were missing the #if + !defined guards that are present in the solaris 2.7 config + header. Thanks to Alex Hornby <alex@anvil.co.uk> for reporting + this. + +Fri Nov 10 11:44:15 2000 Carlos O'Ryan <coryan@uci.edu> + + * examples/RMCast/Send_File/Receiver.cpp: + Fixed errors in Tru64/DUCXX builds. + +Fri Nov 10 10:42:31 2000 Steve Huston <shuston@riverace.com> + + * ace/OS.i (ACE_OS::gethrtime): Removed the ACE_HAS_PENTIUM check + from the #if defined (ACE_WIN32) line surrounding the use of + QueryPerformanceCounter - it works fine on 486 also, per + Bernd Annamaier <bernd.annamaier@de.adtranz.com>. Thanks to + Bernd for testing this out. + + * ace/High_Res_Timer.cpp: Replaced all occurrences of + "defined (ACE_HAS_PENTIUM)" with "defined (ACE_WIN32)" since there + is nothing Pentium-specific any longer in the Win32 sections. + + * THANKS: Added Bernd Annamier to the Hall of Fame. + +Fri Nov 10 12:28:42 2000 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/log_msg/makefile.bor: + * examples/map_manager/makefile.bor: + * examples/makefile.bor: + * performance-tests/makefile.bor: + * performance-tests/Server_Concurrency/makefile.bor: + New Borland makefiles for ACE + +Thu Nov 9 18:39:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/config-sunos5.5.h: + + Added ACE_LACKS_MEMORY_H for SunCC 5, since it seems there is + a bad interaction between memory.h and string.h on that config. + +Thu Nov 9 17:47:37 2000 Carlos O'Ryan <coryan@uci.edu> + + * examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp: + Antoher missing Log_Msg.h + + * examples/Threads/thread_specific.cpp: + Tru64 does not like the convertion from ACE_hthread_t to + unsigned long. I'm trying with a reinterpret_cast, but I don't + have much hope for it. + + * examples/Service_Configurator/IPC-tests/server/Makefile: + * examples/Service_Configurator/Misc/Makefile: + * examples/Timer_Queue/Makefile: + * apps/Gateway/Gateway/Makefile: + * apps/Gateway/Peer/Makefile: + Avoid problems where the library is linked twice, once for the + required dependency in parallel builds an another for the LDLIBS + flag. + + * etc/ace.doxygen: + * etc/ace_man.doxygen: + Use a separate file to generate man pages. We don't want to + document .cpp files or include code in man pages, but that looks + great in HTML documents. + + * etc/tao.doxygen: + * etc/tao_dynamicany.doxygen: + * etc/tao_dynamicinterface.doxygen: + * etc/tao_esf.doxygen: + * etc/tao_iormanip.doxygen: + * etc/tao_iortable.doxygen: + * etc/tao_portableserver.doxygen: + * etc/tao_rtevent.doxygen: + Update the replacement path to some of the tag files, the + generated documents did not get the right cross references. + + * bin/make_pretty.pl: + Add yet another linker error. + + * bin/generate_doxygen.pl: + Parse the man page generation code to create its output path too. + +Thu Nov 9 15:10:28 2000 Carlos O'Ryan <coryan@uci.edu> + + * bin/make_pretty.pl: + In the HTML we replace < with < and > with > otherwise the + output for templates makes no sense. + +Thu Nov 9 12:11:52 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * ace/Makefile (UTILS_FILES): + Modified the Makefile to help when building subsetted shared + libraries. Specifically, moved Addr, INET_Addr, and Sock_Connect + into the Sockets component. That removes the dependancy of the + Utilities and Sockets components on the non-socket IPC component. + + Committing on behalf of Phil Mesnier <mesnier_p@ociweb.com> + +Thu Nov 9 10:38:33 2000 Carlos O'Ryan <coryan@uci.edu> + + * examples/Makefile: + ACE_HAS_GNUG_PRE_2_8 should be used only after + wrapper_macros.GNU is included. + +Thu Nov 9 10:26:01 2000 Carlos O'Ryan <coryan@uci.edu> + + * bin/make_pretty.pl: + Add yet another link error message. + +Thu Nov 9 08:51:04 2000 Carlos O'Ryan <coryan@uci.edu> + + * include/makeinclude/rules.local.GNU: + It seems like I cannot get the rules to create the .obj and + .shobj directories right. This last iteration seems to be + happier, it works fine with parallel builds, it works fine for + static and shared libraries, it does not recompile everything + just because the .obj or .shobj directories changed, it creates + the Templates.DB file when needed. + The only problem that I'm aware off is that it can potentially + produce a warning on parallel builds: two separate rules can try + to create the .obj directory simultaneously, adding a dependency + to have only one rule do it results in full-recompilations when + a .obj directory is modified for whatever reason. + I'm using ACE_NUL_STDERR to avoid such warnings, and it seems to + work correctly. + +Thu Nov 9 10:14:06 2000 Jeff Parsons <parsons@cs.wustl.edu> + + * include/makeinclude/ace_flags.bor: + + Added the line + + TAO_DYNAMICINTERFACE_LIB = + $(CORE_BINDIR)\TAO_DynamicInterface$(LIB_DECORATOR).lib + + that I had overlooked when doing the BCB makefile changes + related to the DynamicInterface library. Thanks to + Johnny Willemsen <Johnny.Willemsen@meco.nl> for sending + in the patch. + + +Wed Nov 8 16:11:11 2000 Carlos O'Ryan <coryan@uci.edu> + + * tests/RMCast/RMCast_Membership_Test.cpp: + Remove unused variables + + * bin/make_pretty.pl: + Add regular expression to detect more linker errors. + +Wed Nov 8 14:10:20 2000 Carlos O'Ryan <coryan@uci.edu> + + * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp: + * examples/IPC_SAP/SPIPE_SAP/client.cpp: + * examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp: + * examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp: + * examples/IPC_SAP/SPIPE_SAP/server.cpp: + * examples/RMCast/Send_File/Sender.cpp: + * examples/Reactor/Misc/test_event_handler_t.cpp: + * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h: + We must explicitly #include "ace/Log_Msg.h", unfortunately the + errors were only detected on platforms that do not define + ACE_TEMPLATES_REQUIRE_SOURCE. + + * include/makeinclude/rules.local.GNU: + More fine tuning, the Templates.DB directory must be created by + the Makefile because SunCC 4.2 generates a warning if it is not + present. + +Wed Nov 8 14:40:25 2000 Chad Elliott <elliott_c@ociweb.com> + + * ace/config-all.h + + Fix a build problem on HP-UX 11.00 with aCC A.03.25. The macro + used to determine the use of the std namespace changed from + RWSTD_NO_NAMESPACE to _NAMESPACE_STD. NOTE: I did preserve the + check for RWSTD_NO_NAMESPACE with aCC versions less than A.03.25. + +Wed Nov 8 10:27:00 2000 Carlos O'Ryan <coryan@uci.edu> + + * bin/generate_doxygen.pl: + Automates the invocation of doxygen. It modifies the doxygen + templates in $ACE_ROOT/etc and creates the right directory + hierarchy to receive the files. + + * ace/config-doxygen.h: + Configuration file used to generate the doxygen files. + Notice that this is not a valid configuration for any platform, + for example, it enables both the Win32 and the POSIX AIO calls. + + * etc/ace.doxygen: + * etc/ace_rmcast.doxygen: + * etc/ace_ssl.doxygen: + * etc/tao.doxygen: + * etc/tao_dynamicany.doxygen: + * etc/tao_dynamicinterface.doxygen: + * etc/tao_esf.doxygen: + * etc/tao_iormanip.doxygen: + * etc/tao_iortable.doxygen: + * etc/tao_portableserver.doxygen: + * etc/tao_rtevent.doxygen: + Minor mods to make the generate_doxygen.pl job easier. + +Wed Nov 8 09:02:10 2000 Carlos O'Ryan <coryan@uci.edu> + + * apps/Gateway/Gateway/Makefile: + * apps/Gateway/Peer/Makefile: + * examples/Timer_Queue/Makefile: + * examples/Service_Configurator/IPC-tests/server/Makefile: + * examples/Service_Configurator/Misc/Makefile: + When generating a library and a binary that uses it in the same + Makefile we must add explicit dependency between them, otherwise + parallel builds can fail. + + * apps/JAWS/server/HTTP_Helpers.cpp: + * examples/IPC_SAP/FILE_SAP/client.cpp: + * examples/Naming/test_multiple_contexts.cpp: + * examples/Threads/thread_specific.cpp: + * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp: + Fixed warnings about mismatches between printf-like strings and + their arguments. + +Wed Nov 8 02:57:15 2000 Darrell Brunsch <brunsch@uci.edu> + + * Local_Name_Space.cpp: + * Local_Name_Space.h: + + Conversion between ACE_WString and ACE_NS_String depended on + ACE_WString storing two byte char's (because it was using + fast_rep ()) Changed to ushort_rep (), but this required + ACE_NS_String to clean up the string once it is done. Added + a destructor and a flag to ACE_NS_String for this purpose. + +Tue Nov 7 11:47:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * tests/Cached_Accept_Conn_Test.cpp: + * tests/Cached_Conn_Test.cpp: + * tests/Collection_Test.cpp: + + Protected some of the explicit template instantiations with #if's + to make sure we don't get duplicate ones with ACE_INT32 == int + (since ACE_HANDLE and DATA are also int in some configurations). + +Tue Nov 7 09:04:15 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/RMCast/RMCast.h: + Undefine macro MT_DATA if defined already. + +Tue Nov 7 09:00:08 2000 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_compile: + By default build everything under ACE_wrappers and + ACE_wrappers/TAO, we used to build just a subset of ACE. + We need to provide full coverage because this script is + replacing all nightly builds, if auto_compile does not test it, + nothing will. + + * bin/show_log_dir.pl: + The script was removing the second and third most recent logs + from the list, this used to be required to remove the brief and + html files, but now we filter those earlier on the script. + +Mon Nov 6 16:23:56 2000 Carlos O'Ryan <coryan@uci.edu> + + * tests/RMCast/RMCast_Fragment_Test.cpp: + * tests/RMCast/RMCast_Reassembly_Test.cpp: + * tests/RMCast/RMCast_Retransmission_Test.cpp: + Fixed warnings reported by DU/CXX + +Sun Nov 5 17:23:55 2000 Carlos O'Ryan <coryan@uci.edu> + + * etc/ace.doxygen: + * etc/ace_rmcast.doxygen: + * etc/ace_ssl.doxygen: + * etc/tao.doxygen: + * etc/tao_dynamicany.doxygen: + * etc/tao_dynamicinterface.doxygen: + * etc/tao_esf.doxygen: + * etc/tao_iormanip.doxygen: + * etc/tao_iortable.doxygen: + * etc/tao_portableserver.doxygen: + * etc/tao_rtevent.doxygen: + Commit doxygen templates, I'm still writing the script to use + them effectively. + +Sun Nov 5 14:37:13 2000 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_compile: + Make log files world readable, under Solaris they are created + with 600 mode by default. + +Sun Nov 5 14:05:13 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/create_vt_dsps.pl: + * tests/version_tests/Atomic_Op_Test.dsp: + * tests/version_tests/Auto_IncDec_Test.dsp: + * tests/version_tests/Barrier_Test.dsp: + * tests/version_tests/Basic_Types_Test.dsp: + * tests/version_tests/Buffer_Stream_Test.dsp: + * tests/version_tests/CDR_Array_Test.dsp: + * tests/version_tests/CDR_File_Test.dsp: + * tests/version_tests/CDR_Test.dsp: + * tests/version_tests/Cache_Map_Manager_Test.dsp: + * tests/version_tests/Cached_Accept_Conn_Test.dsp: + * tests/version_tests/Cached_Conn_Test.dsp: + * tests/version_tests/Capabilities_Test.dsp: + * tests/version_tests/Collection_Test.dsp: + * tests/version_tests/Conn_Test.dsp: + * tests/version_tests/DLL_Test.dsp: + * tests/version_tests/DLList_Test.dsp: + * tests/version_tests/Dynamic_Priority_Test.dsp: + * tests/version_tests/Enum_Interfaces_Test.dsp: + * tests/version_tests/Env_Value_Test.dsp: + * tests/version_tests/Future_Set_Test.dsp: + * tests/version_tests/Future_Test.dsp: + * tests/version_tests/Handle_Set_Test.dsp: + * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: + * tests/version_tests/Hash_Map_Manager_Test.dsp: + * tests/version_tests/High_Res_Timer_Test.dsp: + * tests/version_tests/IOStream_Test.dsp: + * tests/version_tests/Lazy_Map_Manager_Test.dsp: + * tests/version_tests/MM_Shared_Memory_Test.dsp: + * tests/version_tests/MT_Reactor_Timer_Test.dsp: + * tests/version_tests/MT_SOCK_Test.dsp: + * tests/version_tests/Malloc_Test.dsp: + * tests/version_tests/Map_Manager_Test.dsp: + * tests/version_tests/Map_Test.dsp: + * tests/version_tests/Mem_Map_Test.dsp: + * tests/version_tests/Message_Block_Test.dsp: + * tests/version_tests/Message_Queue_Notifications_Test.dsp: + * tests/version_tests/Message_Queue_Test.dsp: + * tests/version_tests/Naming_Test.dsp: + * tests/version_tests/New_Fail_Test.dsp: + * tests/version_tests/Notify_Performance_Test.dsp: + * tests/version_tests/OS_Test.dsp: + * tests/version_tests/Object_Manager_Test.dsp: + * tests/version_tests/OrdMultiSet_Test.dsp: + * tests/version_tests/Pipe_Test.dsp: + * tests/version_tests/Priority_Buffer_Test.dsp: + * tests/version_tests/Priority_Reactor_Test.dsp: + * tests/version_tests/Priority_Task_Test.dsp: + * tests/version_tests/Process_Manager_Test.dsp: + * tests/version_tests/Process_Mutex_Test.dsp: + * tests/version_tests/Process_Strategy_Test.dsp: + * tests/version_tests/RB_Tree_Test.dsp: + * tests/version_tests/Reactor_Exceptions_Test.dsp: + * tests/version_tests/Reactor_Notify_Test.dsp: + * tests/version_tests/Reactor_Performance_Test.dsp: + * tests/version_tests/Reactor_Timer_Test.dsp: + * tests/version_tests/Reactors_Test.dsp: + * tests/version_tests/Reader_Writer_Test.dsp: + * tests/version_tests/Recursive_Mutex_Test.dsp: + * tests/version_tests/Reverse_Lock_Test.dsp: + * tests/version_tests/SOCK_Connector_Test.dsp: + * tests/version_tests/SOCK_Send_Recv_Test.dsp: + * tests/version_tests/SOCK_Test.dsp: + * tests/version_tests/SPIPE_Test.dsp: + * tests/version_tests/SString_Test.dsp: + * tests/version_tests/SV_Shared_Memory_Test.dsp: + * tests/version_tests/Semaphore_Test.dsp: + * tests/version_tests/Service_Config_Test.dsp: + * tests/version_tests/Sigset_Ops_Test.dsp: + * tests/version_tests/Simple_Message_Block_Test.dsp: + * tests/version_tests/Svc_Handler_Test.dsp: + * tests/version_tests/TSS_Test.dsp: + * tests/version_tests/Task_Test.dsp: + * tests/version_tests/Thread_Manager_Test.dsp: + * tests/version_tests/Thread_Mutex_Test.dsp: + * tests/version_tests/Thread_Pool_Reactor_Test.dsp: + * tests/version_tests/Thread_Pool_Test.dsp: + * tests/version_tests/Time_Service_Test.dsp: + * tests/version_tests/Time_Value_Test.dsp: + * tests/version_tests/Timeprobe_Test.dsp: + * tests/version_tests/Timer_Queue_Test.dsp: + * tests/version_tests/Tokens_Test.dsp: + * tests/version_tests/UPIPE_SAP_Test.dsp: + * tests/version_tests/Upgradable_RW_Test.dsp: + * tests/version_tests/version_tests.dsw: + + Updated to use the new ACE_AS_STATIC_LIBS macro. + + * ace/Sample_History.cpp: + * ace/SSL/SSL_Context.cpp: + * ace/SSL/SSL_SOCK_Stream.i: + + Fixed miscellaneous ACE_USES_UNICODE problems with ACE_LIB_TEXT. + +Sat Nov 4 19:33:39 2000 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_compile: + Fixed the mail message, the path to the CGI script was garbled. + + * include/makeinclude/rules.local.GNU: + My last fixed did not work for static builds, the SOLINK rules + got in the way. It works correctly for both static and shared + builds now. + +Sat Nov 4 18:19:46 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/RMCast/RMCast_IO_UDP.cpp: + * ace/RMCast/RMCast_Reassembly.cpp: + * tests/Reactor_Notify_Test.cpp: + Add missing template instantiations, they only showed up in + builds with disabled inlining. + +Sat Nov 4 17:05:08 2000 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_compile: + New revision of the script. It can copy log files directly to + the destination directory, and it also runs the make_pretty + script to generate both the HTML and HTML summary of the log. + + * bin/show_log_dir.pl: + Corrections to the document and more fixes to make it Apache + friendly. + + * include/makeinclude/rules.local.GNU: + Add special target to force the creation of the .shobj and .obj + directories, even with parallel builds. The faster our + computers get the more often we get failures due to this + problem. + +Sat Nov 4 14:53:39 2000 Carlos O'Ryan <coryan@uci.edu> + + * bin/make_pretty.pl: + This is a modified version of Darrell's script to beautify our + auto_compile logs. This version works better with Unix builds + and is going to be invoked by bin/auto_compile to generate + summary logs. + + * bin/show_log_dir.pl: + A CGI script to present all the logs for a particular builds in + a single page. It is a modified version of Darrell's script, + but this time it works better on Unix web servers. + +Fri Nov 3 17:22:10 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/config-sunos5.5.h: Backed of changes given by Russ + Noseworthy through bug id #710. This was breaking SunCC5.0 + builds. + +Fri Nov 3 09:41:20 2000 Carlos O'Ryan <coryan@uci.edu> + + * tests/RMCast/RMCast_Membership_Test.cpp: + Fixed warning about variables possibly uninitialized before + their first use. In fact the variables are initialized before + their first use, but the code flow is too complex for the + compiler to figure that out. + +Fri Nov 3 09:34:39 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Makefile: + * tests/Makefile: + * examples/Makefile: + Disable the RMCast builds for old versions of g++ + +Thu Nov 2 12:11:43 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Name_Request_Reply.h: + * ace/Timer_Hash_T.h: + * ace/Map_Manager.h: + * ace/Log_Record.h: + Minor adjustments to make doxygen happier. + +Thu Nov 2 11:57:37 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Makefile: + * tests/Makefile: + * examples/Makefile: + Enable the RMCast library, tests and examples by default. + +Wed Nov 1 17:24:59 2000 Pradeep Gore <pradeep@cs.wustl.edu> + + * tests/RMCast/Makefile.bor: + Added Makefile, thanks to Christopher Kohlhoff + <chris@kohlhoff.com> and Johnny.Willemsen <Johnny.Willemsen@meco.nl> + for contributing. + +Wed Nov 1 14:11:48 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/*.h: + Change all the header files to generate better docs with + Doxygen. Thanks to Darrell for his wonderful script to automate + this process. + +Tue Oct 31 19:01:19 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * netsvcs/lib/Client_Logging_Handler.cpp (handle_input): Added + a comment explaining why we don't go to heroic lengths to recv() + all the data if it fails after the second recv(). Thanks to + Steve Sivier <Steven.Sivier@Eng.Sun.COM> for motivating this. + +Tue Oct 31 14:21:11 2000 David L. Levine <levine@cs.wustl.edu> + + * bin/check_build_logs: sort the output file names, so + that guajira's cxx build shows up first (locally). + Limit total number of lines to 2000 to keep below + majordomo's size limit. + +Tue Oct 31 10:54:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/Process.i: + + Changed the CREATE_UNICODE_ENVIRONMENT section to be only + in ACE_WIN32 environments. + +Tue Oct 31 11:35:31 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/config-sunos5.5.h: + * ace/Log_Msg.cpp: Added patches provided by Russ. Bugzilla id 710. + +Tue Oct 31 08:14:33 2000 Chris Cleeland <cleeland_c@ociweb.com> + + * wrapper_macros.GNU: + + Set defaults for exceptions, rtti, and fast to all be zero + (0),i.e., off. Henceforth, if you're creating a new port and + you want exceptions to be on, you must explicitly have + "exceptions=1" in your platform_*.GNU file. + + * platform_irix6.x_common.GNU: + + Added an "exceptions=1" directive per the comment above. + +Mon Oct 30 18:56:33 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS.cpp: + * ace/OS.h: + * ace/OS.i: + + Changed several of the socket calls to use char instead + of ACE_TCHAR, seeing that no OS supports anything but char. + But I am keeping the ACE_TCHAR or dual char/wchar_t + interfaces on classes higher up the stream. + + Methods changed are: + + - gethostbyaddr + - gethostbyname + - gethostbyname2 + - gethostbyaddr_r + - gethostbyname_r + - getprotobyname + - getprotobyname_r + - getservbyname + - getservbyname_r + - inet_addr + - inet_ntoa + - inet_aton + - inet_ntop + - inet_pton + + This should take care of a couple of things. First we don't + have to worry about returning a wchar_t * static buffer + instead of a char * static buffer from something like + inet_ntoa and this should remove some slowdowns reported from + gethostbyname. Thanks to Nick Pratt <npratt@microstrategy.com> + for reporting both of these. + + * ace/INET_Addr.cpp: + * ace/INET_Addr.h: + * ace/INET_Addr.i: + + Fixed references to interface changes and added dual + char/wchar_t interfaces to replace some ACE_TCHAR ones. + + * ace/MEM_Addr.cpp: + * ace/MEM_Addr.h: + * ace/MEM_Addr.i: + + Changed get_host_name and get_host_name to return char * + + * ace/SOCK_Dgram_Mcast.cpp: + * ace/SOCK_Dgram_Mcast_QoS.cpp: + + Fixed all the references to the interface changes. + + * ace/Object_Manager.cpp: + + Added ERROR to the output for AV's and Unhandled Exceptions. + +Mon Oct 30 18:51:40 2000 Darrell Brunsch <brunsch@uci.edu> + + * examples/IPC_SAP/SSL_SAP/SSL-client.dsp: + * examples/IPC_SAP/SSL_SAP/SSL-server.dsp: + + Removed hardcoded OpenSSL include directories. + + * ace/ssl/SSL_Context.cpp: + * ace/ssl/SSL_Context.h: + * ace/ssl/SSL_SOCK.cpp: + * ace/ssl/SSL_SOCK_Acceptor.cpp: + * ace/ssl/SSL_SOCK_Acceptor.h: + * ace/ssl/SSL_SOCK_Connector.cpp: + * ace/ssl/SSL_SOCK_Connector.h: + * ace/ssl/SSL_SOCK_Connector.i: + * ace/ssl/SSL_SOCK_Stream.cpp: + * ace/ssl/SSL_SOCK_Stream.h: + * ace/ssl/SSL_SOCK_Stream.i: + + Removed the ACE_HAS_SSL #ifdefs, since ACE_SSL is a + separate library, so it isn't really needed. + +Mon Oct 30 16:34:33 2000 Chris Cleeland <cleeland_c@ociweb.com> + + * include/makeinclude/platform_vxworks5.x_g++.GNU: + + More exceptions/fast/rtti canonicalization fixes. Thanks again, + Carlos. + +Mon Oct 30 11:56:13 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Makefile.am: + * ace/Makefile.bor: + Add missing files to the Borland and Automake makefiles. + +Mon Oct 30 11:38:07 2000 Carlos O'Ryan <coryan@cs.wustl.edu> + + * ace/Basic_Stats.cpp: + * ace/Basic_Stats.inl: + * ace/Sample_History.cpp: + * ace/Stats.cpp: + Fixed problems on platforms that lack 64-bit integers. + +Mon Oct 30 11:10:26 2000 Chris Cleeland <cleeland_c@ociweb.com> + + * include/makeinclude/platform_linux.GNU: + * include/makeinclude/platform_chorus_ghs.GNU: + + The change to canonicalize the values used for + exceptions/fast/rtti caused the default for "exceptions" on these + two platforms to change from exceptions off to exceptions on. + There may be others, but without access to the compiler itself + it's hard to tell what the default behavior is for the compiler + and thus set the value for exceptions/rtti/fast accordingly. + + Thanks to Carlos O'Ryan <coryan@uci.edu> for pointing this out. + +Mon Oct 30 00:57:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * tests/OS_Test.cpp: + + Was a bit overzealous on a previous [] to * change, + so switched one back to [] to remove a segfault + with the strncmp section. + +Sun Oct 29 23:46:54 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/ace_wchar.h: + + Removed the definitions for LPTSTR and LPCTSTR. They + will need to be defined outside of ace or in config.h + to be made available on other platforms. Here is a + sample block which can be added to a non-Win32 config.h: + + typedef char *LPSTR; + typedef const char *LPCSTR; + typedef wchar_t *LPWSTR; + typedef const wchar_t *LPCWSTR; + + #if defined (UNICODE) + typedef const wchar_t *LPCTSTR; + typedef wchar_t *LPTSTR; + typedef wchar_t TCHAR; + #define __TEXT(literal) L##literal + #else + typedef const char *LPCTSTR; + typedef char *LPTSTR; + typedef char TCHAR; + #define __TEXT(literal) literal + #endif + + #define TEXT(literal) __TEXT(literal) + + * ace/config-vxworks5.x.h: + + Added ACE_LACKS_WCSDUP. + +Sun Oct 29 01:59:11 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/doxygen-convert-h.pl: (added) + + New script to convert old header files to new doxygen + style commented files. Works well, but some things + do throw it for a loop, be sure to check output before + checking in. + +Sat Oct 28 15:02:40 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Stats.h: + Cosmetic fixes to make doxygen happier. + +Fri Oct 27 17:21:56 2000 Darrell Brunsch <brunsch@uci.edu> + + * tests/OS_Test.cpp: + + Darrell learned how to use strtok_r properly. 'nuff said. + +Fri Oct 27 17:04:02 2000 Darrell Brunsch <brunsch@uci.edu> + + * tests/OS_Test.cpp: + + Changed the arrays ([]) to array pointers (*) since the + pointer arithmatic I do doesn't seem to work with the + arrays. + +Fri Oct 27 15:45:57 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + Add the new files to the MSVC projects. + +Fri Oct 27 15:02:56 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Makefile: + * ace/Makefile.am: + * ace/Makefile.bor: + * ace/Sample_History.h: + * ace/Sample_History.inl: + * ace/Sample_History.cpp: + Add new class to keep a full history of all the samples in a + performance test. + + * ace/Basic_Stats.h: + * ace/Basic_Stats.inl: + * ace/Basic_Stats.cpp: + * ace/Stats.h: + * ace/Stats.cpp: + Refactor code to compute minimum, maximum, average and jitter + into its own class. It used to be part of ACE_Througthput_Stats + + * performance-tests/TCP/Makefile: + * performance-tests/TCP/tcp_test.cpp: + Use the new ACE_Sample_History class. + +Fri Oct 27 12:04:17 2000 Chris Cleeland <cleeland_c@ociweb.com> + + * platform_chorus.GNU: + * platform_chorus4.x_g++.GNU: + * platform_chorus_ghs.GNU: + * platform_cray.GNU: + * platform_hpux_kcc.GNU: + * platform_linux_cxx.GNU: + * platform_osf1_4.0.GNU: + * platform_sunos5_ghs.GNU: + * platform_sunos5_kcc.GNU: + * platform_sunos5_sunc++.GNU: + * platform_vxworks5.x_diab.GNU: + * platform_vxworks5.x_g++.GNU: + * wrapper_macros.GNU: + + Changed the way that 'rtti', 'exceptions', and 'fast' makeflags + get processed in wrapper_macros.GNU. There was a discrepancy + between the "command line" value and the "platform_macros file" + value each needed in order to turn the feature off, e.g., zero + on the command line and "null" in the file. After + investigation, the discrepancy seemed to be without reason, so + I've canonicalized them. You can now put "exceptions=0" on + either the command line OR in the platform_macros.GNU file. + +Fri Oct 27 10:51:26 2000 Steve Huston <shuston@riverace.com> + + * tests/Reactor_Notify_Test.cpp: Moved definition of 'int status' + outside the auto_ptr-scoping block. + +Fri Oct 27 02:06:29 2000 Luther J Baker <luther@cs.wustl.edu> + + * ace/OS.cpp: + * ace/OS.i: + + Fixed some warnings due to int ace_result_ declared for NT. + +Thu Oct 26 22:18:42 2000 Alex Arulanthu <Alex.Arulanthu@sylantro.com> + + * ace/Log_Msg.h: + * ace/Log_Msg.cpp: + * ace/Service_Config.h: + * ace/Service_Config.cpp: + * ace/Service_Config.i: + + Setting the right default values for process and thread level + priority masks. I had already talk to Steve H about this + change. I just forgot to get this in. + +Thu Oct 26 14:04:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS.h: + + Reverted Doug's change which defined ACE_MAX_USERID to + L_cuserid on all platforms. It ended up that this + is only valid on Windows when _POSIX_ is defined. + +Thu Oct 26 11:20:43 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/RMCast/RMCast_IO_UDP.cpp: + * ace/RMCast/RMCast_Reassembly.cpp: + * tests/CDR_Array_Test.cpp: + * tests/RMCast/RMCast_Fragment_Test.cpp: + * tests/RMCast/RMCast_Membership_Test.cpp: + * tests/RMCast/RMCast_Reassembly_Test.cpp: + * tests/RMCast/RMCast_Reordering_Test.cpp: + * tests/RMCast/RMCast_Retransmission_Test.cpp: + * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp: + + The usual additions of ACE_TEXT to make ACE_USES_WCHAR builds + happy. + +Thu Oct 26 12:19:45 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Memory_Pool.cpp (unmap): Fixed a bug that was preventing + the handle from being closed. Thanks to Ivan Murphy and Dieter + Quehl for reporting this. + +Thu Oct 26 10:56:36 2000 Steve Huston <shuston@riverace.com> + + * ace/OS.i (ACE_OS::rename): Added && (ACE_HAS_WINNT4 == 1) to the + defined (ACE_HAS_WINNT4) to avoid this code section on Win95/98. + +Thu Oct 26 07:39:22 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + ace/OS.h: Added a new macro called ACE_MAX_USERID that is 32 on + Win32 and L_cuserid on other platforms. + + * examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp, + examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.cpp, + examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp, + examples/Service_Configurator/IPC-tests/server/Handle_R_Stream: + Fixed the calls to cuserid() so they don't pass in 0, but + instead pass in a buffer of size ACE_MAX_USERID. This fixes a + problem that occurs on WinNT. Thanks to Mike Curtis + <mccurry@my-deja.com> for pointing this out. + + * tests/Reactor_Notify_Test.cpp: Fixed an unused args warning + and also added the use of auto_ptr to ensure that dynamic memory + is deleted no matter what return path is taken. + +Thu Oct 26 04:00:00 2000 Luther J Baker <luther@cs.wustl.edu> + + * ace/OS.h: + * ace/OS.i: + * ace/OS.cpp: + * ace/OS_Dirent.inl: + Fixing more ACE_HAS_PACE over NT. Most fixes just skip the + PACE call. NT doesn't implement much of posix and so + many ACE calls will skip pace until PACE/WINNT emulates + more posix functionality. + +Wed Oct 25 20:38:33 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/SSL/ACE_SSL.dsp: + + Removed the include/lib directories put here. Instead + we rely on the fact that OpenSSL should be in + DevStudio's global include and library directories. + +Wed Oct 25 13:20:24 2000 Irfan Pyarali <irfan@cs.wustl.edu> + + * tests/Purgable_Map_Manager_Test: Removed this deprecated test. + The following files were effected: + + - Makefile.am + - icc.bat + - t.icc + + These files were removed: + + - Purgable_Map_Manager_Test.cpp + - Purgable_Map_Manager_Test.icc + +Wed Oct 25 11:24:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/adapter/README: (removed) + * ace/adapter/ace/ACE.h: (removed) + * ace/adapter/ace/ARGV.h: (removed) + * ace/adapter/ace/ATM_Addr.h: (removed) + * ace/adapter/ace/Arg_Shifter.h: (removed) + * ace/adapter/ace/Capabilities.h: (removed) + * ace/adapter/ace/DEV_Addr.h: (removed) + * ace/adapter/ace/DLL.h: (removed) + * ace/adapter/ace/Dirent.h: (removed) + * ace/adapter/ace/Dynamic_Service.h: (removed) + * ace/adapter/ace/FIFO.h: (removed) + * ace/adapter/ace/FIFO_Recv.h: (removed) + * ace/adapter/ace/FIFO_Recv_Msg.h: (removed) + * ace/adapter/ace/FIFO_Send.h: (removed) + * ace/adapter/ace/FIFO_Send_Msg.h: (removed) + * ace/adapter/ace/FILE_Addr.h: (removed) + * ace/adapter/ace/Functor.h: (removed) + * ace/adapter/ace/High_Res_Timer.h: (removed) + * ace/adapter/ace/INET_Addr.h: (removed) + * ace/adapter/ace/MEM_Addr.h: (removed) + * ace/adapter/ace/Malloc_T.h: (removed) + * ace/adapter/ace/Memory_Pool.h: (removed) + * ace/adapter/ace/OS.h: (removed) + * ace/adapter/ace/OS_Dirent.h: (removed) + * ace/adapter/ace/OS_String.h: (removed) + * ace/adapter/ace/SOCK_Dgram_Bcast.h: (removed) + * ace/adapter/ace/SOCK_Dgram_Mcast.h: (removed) + * ace/adapter/ace/SOCK_Dgram_Mcast_QoS.h: (removed) + * ace/adapter/ace/SPIPE_Addr.h: (removed) + * ace/adapter/ace/Service_Config.h: (removed) + * ace/adapter/ace/Service_Object.h: (removed) + * ace/adapter/ace/Stats.h: (removed) + * ace/adapter/ace/System_Time.h: (removed) + * ace/adapter/ace/Task_T.h: (removed) + * ace/adapter/ace/Trace.h: (removed) + + The adapter classes were removed since they were + not ready for prime time and their main purpose was + invalidated. If need be, they can be brought back in + the future. + +Wed Oct 25 12:26:25 2000 Carlos O'Ryan <coryan@cs.wustl.edu> + + * ace/RMCast/RMCast_UDP_Reliable_Sender.cpp: + Yet another missing #include + +Wed Oct 25 09:50:48 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/RMCast/RMCast_IO_UDP.h: + * ace/RMCast/RMCast_IO_UDP.cpp: + * ace/RMCast/RMCast_UDP_Reliable_Receiver.h: + * ace/RMCast/RMCast_UDP_Reliable_Receiver.i: + * ace/RMCast/RMCast_UDP_Reliable_Receiver.cpp: + * ace/RMCast/RMCast_UDP_Reliable_Sender.h: + * ace/RMCast/RMCast_UDP_Reliable_Sender.i: + * examples/RMCast/Send_File/Makefile: + * examples/RMCast/Send_File/Sender.cpp: + * examples/RMCast/Send_File/Receiver.cpp: + Change several open() methods to init() because the base class + already has a virtual open() method, but with a different + signature, some compilers generate warnings when this happens. + Add #include required in platforms that do not define + ACE_TEMPLATES_REQUIRE_SOURCE + +Wed Oct 25 09:32:10 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/Object_Manager.cpp: + + Changed to only use the CRT_ERROR disabling under + ACE_DISABLE_WIN32_ERROR_WINDOWS when _DEBUG is defined, + since crtdbg.h is only included by ACE when _DEBUG is + defined. + +Wed Oct 25 10:51:26 2000 Steve Huston <shuston@riverace.com> + + * ace/Select_Reactor_Base.cpp (purge_pending_notifications): Added + ACE_UNUSED_ARG (eh) for the non-ACE_HAS_REACTOR_NOTIFICATION_QUEUE + case to quiet g++'s unused argument warning. + +Tue Oct 24 23:14:55 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS_String.cpp: + * ace/config-win32-borland.h: + + Added ACE_LACKS_WCSDUP to do something similar to + ACE_HAS_STRDUP_EMULATION. Added this to Borland's config, + + Also fixed several warnings in OS_String's emulation + functions that show up with g++. + + * ace/Object_Manager.cpp: + + Added code in the Object Manager to disable some of the + error windows that pops up in Win32 apps. If + ACE_DISABLE_WIN32_ERROR_WINDOWS is defined, then + ACE_ASSERT's and Access Violations will not pop up + error box's anymore. This was mainly added for auto + build purposes. + + * ace/Select_Reactor_Base.cpp: + + Changed ACE_TEXT's to ACE_LIB_TEXT. + + * ace/WFMO_Reactor.cpp: + + In ACE_WFMO_Reactor_Notify::purge_pending_notifications + there was an instance of this type of code: + + for (size_t index = 0; index < ....) + ... + for (index = 0; index ....) + + On Borland, the index is scoped within the for loop, so + the second use of it produces an error. I moved the + declaration outside of the loop to fix this. + +Tue Oct 24 23:40:33 2000 Irfan Pyarali <irfan@cs.wustl.edu> + + * tests/SString_Test.cpp (main): Added tests for string + assignments. + +Tue Oct 24 19:30:16 2000 Steve Huston <shuston@riverace.com> + + * ace/Select_Reactor_Base.cpp (purge_pending_notifications): Correct + erroneous use of 'index' as a variable when it's also a function. + +Tue Oct 24 13:54:49 2000 Ossama Othman <ossama@uci.edu> + + * ace/Makefile (TEMPLATE_FILES): + + Added missing Test_and_Set source file to the list. + + * ace/Makefile.am (libACE_Utils_la_SOURCES, HEADER_FILES, + INLINE_FILES, TEMPLATE_FILES): + + Updated these lists of sources with the newly added sources. + +Tue Oct 24 12:30:47 2000 Steve Huston <shuston@riverace.com> + + * ace/Reactor.h (ACE_Reactor): + * ace/Reactor_Impl.h (ACE_Reactor_Notify and ACE_Reactor_Impl): + * ace/Select_Reactor_Base.h (ACE_Select_Reactor_Notify and + ACE_Select_Reactor_Impl): + * ace/WFMO_Reactor.h (ACE_WFMO_Reactor_Notify and ACE_WFMO_Reactor): + Added new function, purge_pending_notifications (ACE_Event_Handler *) + + * ace/Reactor.i (ACE_Reactor): + * ace/Select_Reactor_Base.i (ACE_Select_Reactor_Impl): + Added implementation of purge_pending_notifications that forwards + the call on to the proper implementation/handler object. + + * ace/Select_Reactor_Base.cpp (ACE_Select_Reactor_Notify): Added + implementation of purge_pending_notifications. Works when + ACE_HAS_REACTOR_NOTIFICATION_QUEUE is defined. Else it does + ACE_NOTSUP_RETURN. + + * ace/WFMO_Reactor.cpp (ACE_WFMO_Reactor, ACE_WFMO_Reactor_Notify): + Added implementation of purge_pending_notifications. + + Thanks to Edan Ayal <edana@bandwiz.com> for supplying the code for + this new feature. + + * ace/Reactor.i (notify): Set the event handler's reactor pointer if + it doesn't already have one. Enables the event handler to purge + its notifications upon destruction. + + * ace/Event_Handler.cpp (~ACE_Event_Handler): Call reactor's + purge_pending_notifications function to avoid delivering notifies + to a deleted handler. + + * tests/Reactor_Notify_Test.cpp: Added the run_notify_purge_test + function to exercise the above new purge_pending_notifications. + +Tue Oct 24 12:05:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS_String.inl: + + Removed an extra } after an #endif that was producing + warnings on OSF. + +Tue Oct 24 09:27:04 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * ace/Test_and_Set.cpp: + Removed the repeated inclusion of the header file. + Thanks to Darrell. + +Tue Oct 24 03:24:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/Basic_Types.h: + * ace/config-win32-common.h: + + Moved the code that defines ACE_SIZEOF_WCHAR to the config file, + so it is easier to add it to other platforms. + + * ace/config-linux-common.h: + + Added ACE_SIZEOF_WCHAR, ACE_LACKS_ITOW, ACE_LACKS_WCSICMP, and + ACE_LACKS_WCSNICMP definitions. + + * ace/Synch.h: + + Moved the ACE_LEGACY_MODE includes further down in the file. It + was producing errors the way it was, since Test_and_Set needed + the Guard classes defined before it was included. + +Mon Oct 23 15:31:52 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Malloc_Allocator.cpp: + Yet another calloc() method that was declared but not defined. + +Mon Oct 23 11:37:06 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * ace/Init_ACE.cpp: + Removed the semicolon at the end of ACE_RCSID. + +Mon Oct 23 11:20:53 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Malloc_T.i: + Add missing function, now things actually link. + +Mon Oct 23 10:02:36 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Malloc_T.h: + Add missing prototype, now the code actually compiles. + +Mon Oct 23 10:59:21 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/OS_String.cpp: Fixed a compile error in gcc 2.95.2. + + * ace/Cached_Connect_Strategy_T.h + * ace/Cached_Connect_Strategy_T.cpp: Added fixes provided by Edan + Ayal <edana@bandwiz.com>. + +Mon Oct 23 08:37:49 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Malloc_T.{h,cpp} + * ace/Malloc_Base.h, + * ace/Malloc_Allocator.{h,cpp}: Added a new calloc() method that + has the same (default) signature as the one in the C/C++ + standard library. Thanks to Shourya Sarcar + <Shourya.Sarcar@geind.ge.com> for reporting this. + + * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp (handle_input): + Fixed a mistake where we were calling release() via a NULL + pointer! Thanks to Pedro Brandao <pbrandao@inescn.pt> for + reporting this. + +Sun Oct 22 18:01:34 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS_String.cpp: + + strtok_r_emulation wasn't protected by #if !defined + (ACE_HAS_REENTRANT_FUNCTIONS). + +Sun Oct 22 17:30:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/ACE.i: + + wcslen was used directly here, changed it to + ACE_OS_String::strlen. + + * ace/ace_wchar.inl: + + Moved around some of the inline functions to + remove warnings. + + * ace/config-vxworks5.x.h: + + Added all the ACE_LACKE_WCS* that VxWorks needs. + +Sun Oct 22 17:22:32 2000 Darrell Brunsch <brunsch@uci.edu> + + * tests/OS_Test.cpp: + + Borland complained about memchr (NULL, ...), since + it couldn't figure out whether to use the void * or + const void* verison of ACE_OS_String::memchr. + Added an explicit cast to help out. + +Sun Oct 22 17:09:26 2000 Darrell Brunsch <brunsch@uci.edu> + + * tests/MT_SOCK_Test.cpp: + + Missed an ACE_ALPHABET in a previous checkin. + + And based on this part of the description in the file: + + "Note that most of the connections will fail since + we're overrunning the size of the listen queue for + the acceptor-mode socket." + + I changed the connection_failed ACE_ERROR_RETURN to an + ACE_DEBUG and return. Now it will not show up as an error + via run_test.pl. + +Sun Oct 22 16:32:24 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/OS_String.cpp: + * ace/OS_String.h: + * ace/OS_String.inl: + * ace/config-linux-common.h: + + Renamed ACE_HAS_SAFE_WCSTOK to ACE_LACKS_WCSTOK to be + consistent with the rest of the ACE_LACKS_WCS* macros. + + Fixed a signature for wcsncmp_emulation, as it was taking + in const wchar_t as the first arg instead of const + wchar_t *. + + Added wcscspn_emulation and an implementation for + wcsncmp_emulation. + +Sun Oct 22 15:35:38 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/Makefile.bor: + + Changed ACE_Sock_Connect.obj to Sock_Connect.obj, since + it appears that it has been renamed. + +Sun Oct 22 15:07:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/ace_dll.dsp: + + While playing with doxygen, I found some old .h files listed + in the project but no longer existed. Removed these. + + * ace/OS_String.cpp: + * ace/OS_String.h: + * ace/OS_String.inl: + + Added quite a few emulation macros for wcs* functions that + often do not exist on platforms. Since these wcs* functions + just play with wchar_t's, they are not difficult to put in. + Some, such as to_upper and strtod/l/ul are more difficult, + so they are not present on platforms without support for + them. + + Also updated the docs to doxygen style. Someday I'll get + around to writing a script to do this... + + * ace/config-win32-borland.h: + * ace/config-win32-msvc.h: + + Added a couple of macros: + - ACE_HAS_STRCASECMP_EQUIVALENT + - ACE_HAS_STRNCASECMP_EQUIVALENT + - ACE_ITOA_EQUIVALENT + + These are used to specify different names for functions + that differ in names across different compilers. + + * tests/OS_Test.cpp: + + Added tests to test OS_String methods so I can make sure + the emulations work. + + * tests/Buffer_Stream_Test.cpp: + * tests/Conn_Test.cpp: + * tests/MM_Shared_Memory_Test.cpp: + * tests/Mem_Map_Test.cpp: + * tests/Priority_Buffer_Test.cpp: + * tests/Priority_Reactor_Test.cpp: + * tests/Reactor_Performance_Test.cpp: + * tests/SOCK_Test.cpp: + * tests/SPIPE_Test.cpp: + * tests/test_config.h: + + In order to get the test_config.h to work when a project + has more than one .cpp file that includes it (and some + compilers give warnings about a static char[]) I moved + ACE_ALPHABET into the tests that need it. Also I changed + it to a static const char[] in places that allowed it. + + So it could be possible to move it back to test_config.h + now that it can be static const char[], but I'm not 100% + sure that will keep all compilers from complaining. + + * tests/run_test.lst: + + Added OS_Test to the list of tests run. + +Sun Oct 22 17:11:16 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Malloc_T.h: Added a default value of sizeof (T) to the + malloc() method of class ACE_Cached_Allocator. Thanks to + Shourya Sarcar <Shourya.Sarcar@geind.ge.com> for reporting this. + +Sun Oct 22 10:08:31 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Makefile.bor: + Update file names for the ACE_ components. + +Sun Oct 22 08:57:33 2000 David L. Levine <levine@cs.wustl.edu> + + * tests/test_config.h: implemented these changes to remove + g++ warnings introduced by: + + Thu Oct 19 13:17:41 2000 Darrell Brunsch <brunsch@uci.edu> + + 1) Moved ace_file_stream typedef to end of file. + 2) Moved inline definition of ACE_Test_Output::output_file () + to before first use. + 3) Removed static qualifier from ACE_ALPHABET. + +Sat Oct 21 12:52:58 2000 Carlos O'Ryan <coryan@uci.edu> + + * Makefile*: + Update dependencies. + +Fri Oct 20 20:46:37 2000 Steve Huston <shuston@riverace.com> + + * ace/OS.i (chdir): Added !defined (AIX) to the !defined (ACE_WIN32) + && defined (<Visual Age C++>) to get it to build clean on AIX. + + * ace/ace-dll.icc: Added Base_Thread_Adapter, Thread_Adapter, + Flag_Manip, Handle_Ops, Init_ACE, Lib_Find, Sock_Connect, + OS_Log_Msg_Attributes, Malloc_Allocator, PI_Malloc, + Thread_Exit, Log_Msg_IPC, OS_Thread_Adapter, Log_Msg_Backend, + Thread_Control (h and cpp). + + * ace/Handle_Ops.cpp: + * ace/PI_Malloc.cpp: Corrected ACE_RCSID args. + +Fri Oct 20 16:38:55 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + Update MSVC projects + +Fri Oct 20 16:23:40 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * ace/ACE.h: + Modified to include the renamed files. + +Fri Oct 20 14:13:43 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * ace/Sock_Connect.i: + * ace/Sock_Connect.h: + * ace/Sock_Connect.cpp: + + * ace/Lib_Find.i: + * ace/Lib_Find.h: + * ace/Lib_Find.cpp: + + * ace/Init_ACE.i: + * ace/Init_ACE.h: + * ace/Init_ACE.cpp: + + * ace/Handle_Ops.i: + * ace/Handle_Ops.h: + * ace/Handle_Ops.cpp: + + * ace/Flag_Manip.i: + * ace/Flag_Manip.h: + * ace/Flag_Manip.cpp: + Renamed the recently added ACE_* files as above to follow + the naming convention. + + * ace/IPC_SAP.h: + * ace/IO_SAP.h: + * ace/FILE_Connector.cpp: + * ace/FILE_Addr.h: + Changed the include files to reflect the above change. + + * ace/Makefile: + Added the new files and updated dependencies. + +Fri Oct 20 11:40:31 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * ace/Makefile: + Updated dependencies. + +Fri Oct 20 02:52:17 2000 Marina Spivak <marina@cs.wustl.edu> + + * bin/auto_run_tests.lst: + + Added RTCORBA Server_Declared test. + +Thu Oct 19 18:02:54 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * ace/OS_Log_Msg_Attributes.h : + Modified u_long to 'unsigned long' as the compiler was + complaining. + +Thu Oct 19 13:52:49 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/Malloc_Allocator.cpp: + * ace/Naming_Context.cpp: + * ace/PI_Malloc.cpp: + + Needed to change some ACE_TEXT's to ACE_LIB_TEXT. + + * ace/OS.h: + * ace/OS_Log_Msg_Attributes.h: + + Moved the definition of ACE_OSTREAM_TYPE from OS.h to + OS_Log_Msg_Attributes.h, since some include paths in + ACE_LEGACY_MODE needed it there. + +Thu Oct 19 13:17:41 2000 Darrell Brunsch <brunsch@uci.edu> + + * tests/run_test.pl: + + Changed the method used to detect errors in a log file. Since + the log contains the log message type (such as LM_ERROR), + I changed the detection to look for this. + + * tests/ACE_Init_Test.cpp: + + Added ACE_START_TEST and ACE_END_TEST so the run_test.pl + script won't think ACE_Init_Test failed. + + * tests/test_config.h: + + With the way ACE_ALPHABET and some functions were defined, + they would cause duplicate symbols if test_config.h was + included in more than one object file. Changed them so + the symbols are static to the file. + + * tests/Reactors_Test.cpp: + + When the reactor was shutting down, it was returning a + information message with ACE_ERROR_RETURN. Since it really + wasn't an error condition, changed this to a ACE_DEBUG + and return 0. + + * tests/SOCK_Send_Recv_Test.cpp: + + The test was checking errno without checking a return value. + As a result, it was getting an out-of-date errno and + incorrectly interpreted that as an error. Fixed. + +Thu Oct 19 12:12:00 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/ACE_Lib_Find.h: + + Added missing static specifier for the wchar version of + strrepl. + +Thu Oct 19 12:03:41 2000 Darrell Brunsch <brunsch@uci.edu> + + * apps/JAWS2/HTTPU/HTTPU.DSP: + * apps/JAWS2/JAWS/jaws.dsp: + + These two projects were placing their DLL's in the wrong + directory. + +Thu Oct 19 14:23:52 2000 Steve Huston <shuston@riverace.com> + + * ace/ace-dll.icc: Removed extraneous ',' from Win32 section. + +Thu Oct 19 12:08:45 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Cached_Connect_Strategy_T.cpp: Fixed compile errors with old + g++. + +Thu Oct 19 09:56:44 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Basic_Types.h: + Must #include stdio.h for platforms that lack 'long long' + +Thu Oct 19 09:50:30 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Log_Msg.cpp: + Fixed problems during TSS cleanup, the ipc_backend_ object was + used after being destroyed. Apparently this only happens on some + platforms, but fortunately David's build detected the bug. + +Thu Oct 19 09:07:47 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/RMCast/RMCast_Copy_On_Write.h: + Fixed problem in 'friend' declaration, most compilers let it go + through, but not the newer gcc snapshots. Thanks to Craig + Rodrigues <crodrigu@bbn.com> for providing this patch. + +Wed Oct 18 15:44:14 2000 Luther J Baker <luther@cs.wustl.edu> + + * OS.h: + * OS.i: + * OS.cpp: + + Modifications to sem_open debugging ACE_HAS_PACE over NT. + +Wed Oct 18 09:45:12 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Cached_Connect_Strategy_T.h : + * ace/Cached_Connect_Strategy_T.cpp: Added some fixes provided by + Edan Ayal <edana@bandwiz.com>. + +Tue Oct 17 23:35:33 2000 David L. Levine <levine@cs.wustl.edu> + + * Don't use ACE_TSS_EMULATION by default with LynxOS 3.1.0 + because it's not necessary, according to + Jessie Ragsdale <jessie.ragsdale@latuslw.com>, and breaks + split=1. Jessie was able to create upo to 118 natvie TSS keys, + so the 3-key limit of LynxOS 3.0.0 has been removed in 3.1.0. + [Bug 701] + +Tue Oct 17 00:21:41 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h, + examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i, + examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h, + examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i, + examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h, + examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i, + examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h, + examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i, + examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h, + examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i: + Changed *::get_handle(), *::handle_input(), and + *::handle_close() to use ACE_HANDLE and ACE_INVALID_HANDLE + instead of int and -1. Thanks to Mike Curtis + <mccurry@my-deja.com> for pointing this out. + +Mon Oct 16 14:05:13 2000 David L. Levine <levine@cs.wustl.edu> + + * ACE-INSTALL.html: removed spurious 3D characters from + VxWorks section. + +Mon Oct 16 11:17:08 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Makefile.am: + Fixed misnamed file. + +Mon Oct 16 11:07:34 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Log_Msg.cpp: + Fixed memory leak, or rather, make sure that the default Log_Msg + IPC backend is destroyed when the Log_Msg class is closed. + + * ace/Object_Manager.cpp: + Fixed typo in #endif, the final comment was not really a + comment. + +Sun Oct 15 19:14:13 2000 Marina Spivak <marina@cs.wustl.edu> + + * bin/auto_run_tests.lst: + Excluded tests/RTCORBA/Client_Propagated from running in + Exceptions build since it's a linux build. + +Sat Oct 14 15:04:16 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.h: + * ace/Naming_Context.h: + Static services must be exported from the library, so they + require the right export directives. + Added a new ACE_STATIC_SVC_DECLARE_EXPORT() macro for that + purpose and use it for the Naming_Context. + +Sat Oct 14 09:55:43 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Makefile.bor: + Fixed typo in file name. + +Sat Oct 14 03:32:54 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * ace/ACE_Flag_Manip.h: + * ace/Service_Templates.h: + Added a missing header file. + +Fri Oct 13 22:40:27 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + Add new files to the project. + + * ace/Log_Msg.cpp: + Fixed typo in management of structured exception handling + callbacks. + +Fri Oct 13 21:49:54 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Makefile: + * ace/Makefile.am: + * ace/Makefile.bor: + Add the new Log_Msg files to the Makefiles. + + * ace/ACE_Lib_Find.cpp: + Add ACE_RCSID macro + + * ace/config-all.h: + * ace/OS_Log_Msg_Attributes.h: + * ace/OS_Log_Msg_Attributes.inl: + * ace/OS_Log_Msg_Attributes.cpp: + * ace/Base_Thread_Adapter.h: + * ace/Base_Thread_Adapter.cpp: + We pre-allocate the Log_Msg attributes in the Thread_Adapter, to + minimize memory allocations during thread creation. + + * ace/Log_Msg_Callback.h: + * ace/Log_Msg_Callback.cpp: + Move the Log_Msg callback interface to its own file. + + * ace/Log_Msg_Backend.h: + * ace/Log_Msg_Backend.cpp: + Define the interface for Log_Msg backend strategies. + + * ace/Log_Msg_IPC.h: + * ace/Log_Msg_IPC.cpp: + Implement a Log_Msg backend based on IPC. + The intention is to decouple Log_Msg from IPC components, thus + Log_Msg only uses the abstract class ACE_Log_Msg_Backend. + In the future we could implement other backends, such as logging + to syslog or the NT event log directly. + We need to use a dynamically loaded factory to complete the + decoupling, but that would take a little more effort. + + * ace/Log_Msg.h: + * ace/Log_Msg.cpp: + Use the attributes directly. + Use the new Log_Msg_Backend classes. + + * tests/Log_Msg_Test.cpp: + * examples/Log_Msg/test_callback.cpp: + #include Log_Msg_Callback.h, the file is not included unless + ACE_LEGACY_MODE is set. + + * tests/Malloc_Test.cpp: + Add missing #include + + * examples/Shared_Malloc/test_position_independent_malloc.h: + * examples/Shared_Malloc/test_position_independent_malloc.cpp: + Reordered #includes to make them more standard. + +Fri Oct 13 22:34:59 2000 Marina Spivak <marina@cs.wustl.edu> + + * bin/auto_run_tests.lst: + + Added new TAO/tests/RTCORBA/Client_Protocol test to the list. + Removed TAO/tests/Endpoint_Per_Priority because + TAO::Client_Priority_Policy is now disabled in builds by + default. Enabled TAO/tests/RTCORBA/Server_Protocol for linux + builds (it was disabled for some reason). + +Fri Oct 13 19:12:31 2000 Steve Huston <shuston@riverace.com> + + * ace/Malloc_T.h: Added #include "ace/Malloc.h" because the definition + of ACE_Control_Block is needed, and it's in Malloc.h. + +Fri Oct 13 18:47:51 2000 Steve Huston <shuston@riverace.com> + + * ace/Caching_Strategies_T.cpp: + * ace/Dynamic_Service.cpp: + * ace/Timer_Hash_T.cpp: + * ace/Timer_Wheel_T.cpp: + * netsvcs/lib/Log_Message_Receiver.cpp: Added #include "ace/Log_Msg.h" + else IBM C++ can't compile the template at instantiation time. + + * tests/Process_Strategy_Test.h: Added #include "ace/File_Lock.h" to + see ACE_File_Lock, so IBM C++ can compile the templates. + +Fri Oct 13 18:43:24 2000 Steve Huston <shuston@riverace.com> + + * tests/MM_Shared_Memory_Test.cpp: Changed SYNCHRONIZER ctor for + ACE_SV_Semaphore_Simple case to specify + ACE_SV_Semaphore_Simple::ACE_CREATE, not ACE_SV_Semaphore_Complex:: + ACE_CREATE. Else it got compile failures on Solaris, Sun CC, + in PACE build (why in just PACE build? Dunno...) + +Fri Oct 13 13:57:40 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * ace/Process_Manager.h : + * ace/Process_Manager.cpp : + + * ace/Service_Config.h : + * ace/Service_Config.cpp: + + Removed dependency of Service_Config on Process_Manager by + registering the Process_Manager singleton with the + Object_Manager when it is instantiated. This way we need not call + ACE_Process_Manager::close_singleton () in Service_Config + implementation. + +Mon Oct 9 10:34:18 2000 Ossama Othman <ossama@uci.edu> + + * configure.in: + + Corrected comments regarding the ACE_HAS_STREAM_PIPES run-time + test. + +Fri Oct 13 11:41:29 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * ace/Makefile.bor (OBJFILES): + * ace/Makefile.am (libACE_Utils_la_SOURCES): + Updated to include the new files. + + * examples/Shared_Malloc/test_position_independent_malloc.cpp: + Included a header file. + +Fri Oct 13 11:43:56 2000 David L. Levine <levine@cs.wustl.edu> + + * ACE-INSTALL.html: updated supported platforms list. + +Fri Oct 13 11:39:54 2000 David L. Levine <levine@cs.wustl.edu> + + * ACE-INSTALL.html: added Jaffar Shaikh's <Jaffar_Shaikh@Mitel.COM> + notes for building for VxWorks target on NT host. + +Fri Oct 13 06:26:18 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * examples/RMCast/Send_File: + Added makefiles for Send_File multicast example. + + * include/makeinclude/build_dll.bor: + * include/makeinclude/build_exe.bor: + * include/makeinclude/build_lib.bor: + Added support for compilation of C source files. + + * include/makeinclude/ace_flags.bor: + Added IORManip and FaultTolerance libraries for TAO. + + Thanks to Christopher Kohlhoff for providing these fixes. + +Thu Oct 12 23:33:21 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Synch.h: + * ace/Synch_T.h: + * ace/Test_and_Set.cpp: + Fixed order of includes to compile under gcc. + +Thu Oct 12 22:58:13 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/ACE_Lib_Find.h: + * ace/ACE_Lib_Find.cpp: + * ace/ACE.cpp: + Move the wchar version of strrepl and strsplit_r to the + ACE_Lib_Find class, the other versions where there already. + + * ace/FILE_IO.h: + * ace/FILE_Connector.cpp: + Add missing #include in FILE_IO.h that is used in FILE_IO.i + + * ace/Test_and_Set.h: + * ace/Test_and_Set.cpp: + Fixed the guards for the .cpp file. Add the #include for + platforms that requires template source visible, and add the + #pragma implementation for (really) old g++ versions. + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + Move Test_and_Set.cpp to the "Template Files" folder, and + disable compilation for it. + +Thu Oct 12 23:09:17 2000 Joe Hoffert <joeh@cs.wustl.edu> + + * ace/OS.i: + Added a !defined (__Lynx__) check for ACE_HAS_PACE in the + ACE_OS::mmap function. ACE does some special things for Lynx + for mmap since Lynx's mmap is deficient. Probably should + move this fix from ACE to PACE at some point. + +Thu Oct 12 19:38:00 2000 Ossama Othman <ossama@uci.edu> + + * ace/ace_dll.dsp: + * ace/ace_lib.dsp: + + Added new files introduced by Priyanka's footprint reduction + effort. + +Thu Oct 12 18:19:46 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * ace/Makefile: + Made the corresponding changes. + + * ace/System_Time.cpp: + * ace/UPIPE_Connector.cpp : + * ace/Timer_Queue_T.h : + * ace/Task.cpp : + * ace/POSIX_Asynch_IO.cpp: + * ace/OS.h: + * ace/Memory_Pool.cpp: + * ace/MEM_SAP.h: + * ace/MEM_Acceptor.cpp: + * ace/Logging_Strategy.cpp: + * ace/FIFO.h: + * ace/DLL.cpp: + * ace/IO_SAP.h: + * ace/Malloc_T.h : + Cosmetic changes. Ex: Change the included header files to the + new header files and similar changes. + + * ace/Naming_Context.h: + * ace/Naming_Context.cpp: + * ace/Object_Manager.cpp: + + Removed the dependency of Object_Manager on Naming_Context. + + * ace/Test_and_Set.h: + * ace/Test_and_Set.cpp: + * ace/Test_and_Set.i: + + Moved the class Test_and_Set from Synch_T to here. This helped + remove the dependency on Event_Handler. + + * ace/Service_Templates.h: + * ace/Service_Templates.cpp: + + Moved the template instantiations from Service_Config.cpp and + Service_Types.cpp since these templates were not needed by the + respective files. + + * ace/Malloc_Allocator.h : + * ace/Malloc_Allocator.cpp: + * ace/Malloc_Allocator.i : + + * ace/PI_Malloc.h : + * ace/PI_Malloc.cpp: + * ace/PI_Malloc.i : + + * ace/Malloc.h : + * ace/Malloc.cpp : + * ace/Malloc.i : + + Moved the ACE_PI_Control_Block, ACE_New_Allocator and + ACE_Static_Allocator_Base classes to new files: PI_Malloc and + Malloc_Allocator. + + This move helps in reduction in size of Malloc.i since the + template instantiations which were included only for + ACE_PI_Control_Block are now moved to the new file: PI_Malloc. + In addition, is the effect of clear and minimized dependencies. + + * ace/ACE.h : + * ace/ACE.cpp : + * ace/ACE.i : + + Moved several functions in ACE to new classes to minimize the + dependencies on and by ACE. Each of the following files + have the listed functions. + + * ace/Malloc_Instantiations.cpp: + Moved the template instantiations to this file. + + * ace/ACE_Sock_Connect.h : + * ace/ACE_Sock_Connect.cpp : + * ace/ACE_Sock_Connect.i : + + Has the socket connection establishment function calls : + bind_port, get_bcast_addr, get_ip_interfaces, count_interfaces + and get_handle. + + Helps remove the dependency on INET_Addr. + + * ace/ACE_Handle_Ops.h: + * ace/ACE_Handle_Ops.cpp: + * ace/ACE_Handle_Ops.i: + + Has the <handle_timed_open> operation on handles. + Helps remove the dependency of FILE_Connector, SPIPE_COnenctor, + UPIPE_Conenctpr and DEV_Connector on ACE. + + * ace/ACE_Lib_Find.h : + * ace/ACE_Lib_Find.cpp : + * ace/ACE_Lib_Find.i : + + Includes all the functions to search and open shared + libraries and realted functions : + ldfind, ldopen, ldname, get_temp_dir, open_temp_file, + strrepl, strsplit_r. + + Removes the dependency of DLL, Logging_Strategy and FILE_Addr on + ACE. Effects few other classes too but doesnt remove the + dependency on ACE for those classes. + + * ace/ACE_Flag_Manip.h : + * ace/ACE_Flag_Manip.cpp: + * ace/ACE_Flag_Manip.i : + + The Flag Manipulation functions: + set_flags (), clr_flags () and get_flags (). + + Removes the dependency of IO_SAP and IPC_SAP on ACE. + + * ace/ACE_Init.h : + * ace/ACE_Init.cpp: + * ace/ACE_Init.i : + + The init () and fini () functions which are used + for the initialization and shutting down of ACE. + + Removes dependency on Object_Manager. + +Thu Oct 12 15:41:46 2000 Carlos O'Ryan <coryan@uci.edu> + + * include/makeinclude/rules.bin.GNU: + List the LDFLAGS before the name of the program, this seems to + work better for some of our sponsors. + +Thu Oct 12 15:40:51 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.cpp (ACE_OS_GUARD): + Use explicit names for the OS guards, otherwise the SGI compiler + (7.30 + several patches) crashes. Thanks to Philip Miller + <pwmiller@sarnoff.com> for reporting the problem and providing + the patch. + +Thu Oct 12 12:15:23 2000 Angelo <corsaro@cs.wustl.edu> + + * ACE version 5.1.10 released. diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h index 66ba33d02ed..8af242724c9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h @@ -11,10 +11,10 @@ */ //============================================================================= -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" // = AVStreams calls this class when data shows up from a sender. class Receiver_Callback : public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl index 878bbe54a79..2de9e19a586 100755 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl @@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../../bin'; use PerlACE::Run_Test; -use File::stat; # amount of delay between running the servers @@ -17,14 +16,11 @@ $status = 0; $nsior = PerlACE::LocalFile ("ns.ior"); $outfile = PerlACE::LocalFile ("output"); -# generate test stream data -$input = PerlACE::generate_test_file("test_input", 102400); - unlink $nsior; $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior"); $SV = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior"); -$CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -f $input"); +$CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior"); print STDERR "Starting Naming Service\n"; @@ -32,7 +28,7 @@ $NS->Spawn (); if (PerlACE::waitforfile_timed ($nsior, 5) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } @@ -66,6 +62,6 @@ if ($nserver != 0) { } unlink $nsior; -unlink $output, $input; +unlink $output; exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h index 22483881f89..0be17acd796 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h @@ -10,10 +10,10 @@ */ //============================================================================= -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" // = Defines application specific sender stream endpoint. class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp index 55c1b9ddf46..19f72b8060a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -245,11 +245,6 @@ Client::init (int argc,char **argv) { ACE_DEBUG ((LM_DEBUG,"file opened successfully\n")); } - else - { - ACE_ERROR_RETURN ((LM_ERROR, "ERROR: file %s could not be opened\n", - this->filename_), -1); - } return 0; } diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h index 20bdbda0205..eab3bf37497 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h @@ -7,12 +7,12 @@ #include "ace/Get_Opt.h" #include "tao/PortableServer/PortableServer.h" #include "tao/Strategies/advanced_resource.h" -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Transport.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Transport.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" class FTP_Client_Callback :public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl index 9552c5f8c89..1f9ae20a47d 100755 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl @@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../../bin'; use PerlACE::Run_Test; -use File::stat; # amount of delay between running the servers @@ -17,16 +16,14 @@ $status = 0; $nsior = PerlACE::LocalFile ("ns.ior"); $test1 = PerlACE::LocalFile ("test1"); $test2 = PerlACE::LocalFile ("test2"); - -# generate test stream data -$input = PerlACE::generate_test_file("test_input", 102400); +$makefile = PerlACE::LocalFile ("Makefile"); unlink $nsior, $test1, $test2; $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior"); $SV1 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test1"); $SV2 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test2"); -$CL = new PerlACE::Process ("ftp", "-ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -f $input"); +$CL = new PerlACE::Process ("ftp", "-ORBSvcConf components_svc$PerlACE::svcconf_ext -ORBInitRef NameService=file://$nsior -f $makefile"); print STDERR "Starting Naming Service\n"; @@ -34,7 +31,7 @@ $NS->Spawn (); if (PerlACE::waitforfile_timed ($nsior, 15) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } @@ -80,6 +77,6 @@ if ($nserver != 0) { $status = 1; } -unlink $nsior, $test1, $test2, $input; +unlink $nsior, $test1, $test2; exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h index 1aec3d351c7..6d0b3a697c9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h @@ -3,14 +3,14 @@ #include "ace/Get_Opt.h" #include "tao/Strategies/advanced_resource.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Transport.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Transport.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class FTP_Server_StreamEndPoint :public TAO_Server_StreamEndPoint diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h index 08d558dc82b..18ff8ec8671 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h @@ -6,12 +6,12 @@ #include "ace/Get_Opt.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Flows_T.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Flows_T.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" class FTP_Client_Callback; class FTP_Client_Producer diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl index bbc47d41b8a..c168a476ea7 100755 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl @@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../../bin'; use PerlACE::Run_Test; -use File::stat; # amount of delay between running the servers @@ -17,16 +16,14 @@ $status = 0; $nsior = PerlACE::LocalFile ("ns.ior"); $test1 = PerlACE::LocalFile ("test1"); $test2 = PerlACE::LocalFile ("test2"); - -# generate test stream data -$input = PerlACE::generate_test_file("test_input", 102400); +$makefile = PerlACE::LocalFile ("Makefile"); unlink $nsior, $test1, $test2; $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior"); $SV1 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test1"); $SV2 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test2"); -$CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -f $input"); +$CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -f $makefile"); print STDERR "Starting Naming Service\n"; @@ -34,7 +31,7 @@ $NS->Spawn (); if (PerlACE::waitforfile_timed ($nsior, 5) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } @@ -80,6 +77,6 @@ if ($nserver != 0) { $status = 1; } -unlink $nsior, $test1, $test2, $input; +unlink $nsior, $test1, $test2; exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h index b292ff910e5..ac21c891ced 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h @@ -2,13 +2,13 @@ // $Id$ #include "ace/Get_Opt.h" -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Flows_T.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Flows_T.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class FTP_Server_Callback :public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/input b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/input new file mode 100644 index 00000000000..b6579cec283 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/input @@ -0,0 +1,995 @@ +#---------------------------------------------------------------------------- +# input,v 1.1 2001/03/27 11:41:00 irfan Exp +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SERVER_OBJS = server.o +CLIENT_OBJS = ftp.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = ftp server +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = server ftp + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# 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.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/ftp.o .obj/ftp.so .shobj/ftp.o .shobj/ftp.so: ftp.cpp ftp.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.inl \ + $(ACE_ROOT)/ace/Stats.i + +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.inl \ + $(ACE_ROOT)/ace/Stats.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h index f5fb5efa767..8bc7686cf71 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h @@ -18,11 +18,11 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl index c04de62dfd6..6d63232651b 100755 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl @@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib $ENV{"ACE_ROOT"}.'/bin'; use PerlACE::Run_Test; -use File::stat; # amount of delay between running the servers @@ -17,14 +16,11 @@ $status = 0; $nsior = PerlACE::LocalFile ("ns.ior"); $outfile = PerlACE::LocalFile ("output"); -# generate test stream data -$input = PerlACE::generate_test_file("test_input", 102400); - unlink $nsior; $NS = new PerlACE::Process ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/Naming_Service", "-o $nsior"); $SV = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -f output"); -$CL = new PerlACE::Process ("sender", "-ORBDebugLevel 2 -ORBInitRef NameService=file://$nsior -f $input -r 2"); +$CL = new PerlACE::Process ("sender", "-ORBDebugLevel 2 -ORBInitRef NameService=file://$nsior -f input -r 2"); print STDERR "Starting Naming Service\n"; @@ -66,6 +62,6 @@ if ($nserver != 0) { } unlink $nsior; -unlink $output, $input; +unlink $output; exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h index d37c46f21b9..f4f8b4716c2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" typedef ACE_Unbounded_Set<TAO_AV_Protocol_Object*> ProtocolObject_Set; typedef ACE_Unbounded_Set_Iterator<TAO_AV_Protocol_Object*> ProtocolObject_SetItor; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h index 50e7a20e39b..772016bf4f8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h @@ -22,11 +22,11 @@ #define TAO_AV_FTP_H #include "ace/Get_Opt.h" -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class FTP_Client_Callback : public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl index 87223c84b1a..6822ea67bf3 100755 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl @@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../../bin'; use PerlACE::Run_Test; -use File::stat; # amount of delay between running the servers @@ -15,17 +14,15 @@ $sleeptime = 2; $status = 0; $nsior = PerlACE::LocalFile ("ns.ior"); +$makefile = PerlACE::LocalFile ("Makefile"); $debug = 0; -# generate test stream data -$input = PerlACE::generate_test_file("test_input", 102400); - unlink $nsior; -for ($i = 0; $i <= $#ARGV; $i++) +for ($i = 0; $i <= $#ARGV; $i++) { - if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") + if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { print STDERR "\nusage: run_test\n"; @@ -44,12 +41,12 @@ for ($i = 0; $i <= $#ARGV; $i++) exit; } - elsif ($ARGV[$i] eq "-p") + elsif ($ARGV[$i] eq "-p") { @protocols = split (',', $ARGV[$i + 1]); $i++; } - elsif ($ARGV[$i] eq "-d") + elsif ($ARGV[$i] eq "-d") { $debug = $ARGV[$i + 1]; $i++; @@ -62,10 +59,10 @@ print STDERR "Starting Naming Service\n"; $NS->Spawn (); -if (PerlACE::waitforfile_timed ($nsior, 100) == -1) +if (PerlACE::waitforfile_timed ($nsior, 100) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } @@ -83,26 +80,26 @@ for $protocol (@protocols) } $SV = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -f ".$output_file); - $CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol." -f $input"); - + $CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol." -f $makefile"); + print STDERR "Using ".$protocol."\n"; print STDERR "Starting Receiver\n"; - + $SV->Spawn (); - + sleep $sleeptime; - + print STDERR "Starting Sender\n"; - + $sender = $CL->SpawnWaitKill (200); - + if ($sender != 0) { print STDERR "ERROR: sender returned $sender\n"; $status = 1; } - + $receiver = $SV->TerminateWaitKill (200); - + if ($receiver != 0) { print STDERR "ERROR: receiver returned $receiver\n"; $status = 1; @@ -117,6 +114,6 @@ if ($nserver != 0) { } unlink $nsior; -unlink $output, $input; +unlink $output; exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h index c1c6776efe2..146d1e9486c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h @@ -16,10 +16,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class FTP_Server_Callback : public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp index 4faa8c72ae8..2fcda3f1f64 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp @@ -1,5 +1,5 @@ #include "TimeStamp.h" -#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" #include "ace/High_Res_Timer.h" // $Id$ diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h index c19b488104f..e860731f0ad 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h @@ -2,7 +2,7 @@ #define TIMESTAMP_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" #include "ace/Dynamic_Service.h" #include "export.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/input b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/input new file mode 100644 index 00000000000..b6579cec283 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/input @@ -0,0 +1,995 @@ +#---------------------------------------------------------------------------- +# input,v 1.1 2001/03/27 11:41:00 irfan Exp +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SERVER_OBJS = server.o +CLIENT_OBJS = ftp.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = ftp server +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = server ftp + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# 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.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/ftp.o .obj/ftp.so .shobj/ftp.o .shobj/ftp.so: ftp.cpp ftp.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.inl \ + $(ACE_ROOT)/ace/Stats.i + +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.inl \ + $(ACE_ROOT)/ace/Stats.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h index 39c4ac3b39e..2ab749b7c70 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl index c04de62dfd6..6d63232651b 100755 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl @@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib $ENV{"ACE_ROOT"}.'/bin'; use PerlACE::Run_Test; -use File::stat; # amount of delay between running the servers @@ -17,14 +16,11 @@ $status = 0; $nsior = PerlACE::LocalFile ("ns.ior"); $outfile = PerlACE::LocalFile ("output"); -# generate test stream data -$input = PerlACE::generate_test_file("test_input", 102400); - unlink $nsior; $NS = new PerlACE::Process ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/Naming_Service", "-o $nsior"); $SV = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -f output"); -$CL = new PerlACE::Process ("sender", "-ORBDebugLevel 2 -ORBInitRef NameService=file://$nsior -f $input -r 2"); +$CL = new PerlACE::Process ("sender", "-ORBDebugLevel 2 -ORBInitRef NameService=file://$nsior -f input -r 2"); print STDERR "Starting Naming Service\n"; @@ -66,6 +62,6 @@ if ($nserver != 0) { } unlink $nsior; -unlink $output, $input; +unlink $output; exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h index 20e9dc6ef50..3324e95747f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp index 2ad409534ab..66dc44f0ef8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp @@ -2,7 +2,7 @@ #include "distributer.h" #include "ace/Get_Opt.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" typedef ACE_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h index 8b9f74cdf07..6baa0c53584 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Distributer_Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/input b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/input new file mode 100644 index 00000000000..f220a0b638f --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/input @@ -0,0 +1,9541 @@ +#---------------------------------------------------------------------------- +# $Id$ +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SENDER_OBJS = sender.o +DISTRIBUTER_OBJS = distributer.o +RECEIVER_OBJS = receiver.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = sender distributer receiver +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = sender distributer receiver + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# 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.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i + +.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h + +.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY +#---------------------------------------------------------------------------- +# $Id$ +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SENDER_OBJS = sender.o +DISTRIBUTER_OBJS = distributer.o +RECEIVER_OBJS = receiver.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = sender distributer receiver +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = sender distributer receiver + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# 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.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i + +.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h + +.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY +#---------------------------------------------------------------------------- +# $Id$ +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SENDER_OBJS = sender.o +DISTRIBUTER_OBJS = distributer.o +RECEIVER_OBJS = receiver.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = sender distributer receiver +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = sender distributer receiver + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# 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.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i + +.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h + +.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY +#---------------------------------------------------------------------------- +# $Id$ +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SENDER_OBJS = sender.o +DISTRIBUTER_OBJS = distributer.o +RECEIVER_OBJS = receiver.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = sender distributer receiver +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = sender distributer receiver + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# 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.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i + +.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h + +.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY +#---------------------------------------------------------------------------- +# $Id$ +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SENDER_OBJS = sender.o +DISTRIBUTER_OBJS = distributer.o +RECEIVER_OBJS = receiver.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = sender distributer receiver +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = sender distributer receiver + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# 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.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i + +.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h + +.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY +#---------------------------------------------------------------------------- +# $Id$ +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SENDER_OBJS = sender.o +DISTRIBUTER_OBJS = distributer.o +RECEIVER_OBJS = receiver.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = sender distributer receiver +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = sender distributer receiver + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# 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.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i + +.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h + +.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY +#---------------------------------------------------------------------------- +# $Id$ +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SENDER_OBJS = sender.o +DISTRIBUTER_OBJS = distributer.o +RECEIVER_OBJS = receiver.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = sender distributer receiver +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = sender distributer receiver + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# 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.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/sender.o .obj/sender.so .shobj/sender.o .shobj/sender.so: sender.cpp sender.h $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i + +.obj/distributer.o .obj/distributer.so .shobj/distributer.o .shobj/distributer.so: distributer.cpp distributer.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h + +.obj/receiver.o .obj/receiver.so .shobj/receiver.o .shobj/receiver.so: receiver.cpp receiver.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h index a08f222d24d..73d30316424 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl index 955ef15c05d..b44101b5e19 100755 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl @@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../../bin'; use PerlACE::Run_Test; -use File::stat; # amount of delay between running the servers @@ -16,14 +15,12 @@ $status = 0; $nsior = PerlACE::LocalFile ("ns.ior"); $testfile = PerlACE::LocalFile ("test"); - -# generate test stream data -$input = PerlACE::generate_test_file("test_input", 102400); +$makefile = PerlACE::LocalFile ("input"); unlink $nsior; $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior"); -$SV = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -f $input"); +$SV = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -f $makefile"); $RE = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -f $testfile"); $DI = new PerlACE::Process ("distributer", "-ORBInitRef NameService=file://$nsior"); @@ -33,7 +30,7 @@ $NS->Spawn (); if (PerlACE::waitforfile_timed ($nsior, 10) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } @@ -81,6 +78,6 @@ if ($nserver != 0) { } unlink $nsior; -unlink $testfile, $input; +unlink $testfile; exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h index a5e40f9134e..5fbcc6818ec 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/input b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/input new file mode 100644 index 00000000000..7b215c80b28 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/input @@ -0,0 +1,995 @@ +#----------------------------------------------------------------------------
+# $Id: input,v 1.1 2001/03/09 18:57:30 irfan Exp $
+#
+# Top-level Makefile for Pluggable testing of AVStreams of TAO.
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+# Local macros
+#----------------------------------------------------------------------------
+
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+
+SERVER_OBJS = server.o
+CLIENT_OBJS = ftp.o
+
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+FILES = ftp server
+DEFS = $(addsuffix .h,$(FILES))
+LSRC = $(addsuffix .cpp,$(FILES))
+
+BIN2 = server ftp
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
+ BIN = $(BIN2)
+endif # AV
+
+#----------------------------------------------------------------------------
+# 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.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#DCFLAGS = -g
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
+ -I$(TAO_ROOT)
+
+#server:$(addprefix $(VDIR),$(SERVER_OBJS))
+# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS))
+# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/ftp.o .obj/ftp.so .shobj/ftp.o .shobj/ftp.so: ftp.cpp ftp.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Services.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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.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/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.inl \
+ $(ACE_ROOT)/ace/Stats.i
+
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/ATM_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.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/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(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.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Process_Semaphore.h \
+ $(ACE_ROOT)/ace/Process_Semaphore.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.h \
+ $(ACE_ROOT)/ace/Basic_Stats.inl \
+ $(ACE_ROOT)/ace/Stats.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h index 718b2deac25..e2694e1be03 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" #include "Receiver_Stats.h" class Receiver_Callback : public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl index d8bde72c0f5..5dd90188fa6 100755 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl @@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../../bin'; use PerlACE::Run_Test; -use File::stat; # amount of delay between running the servers @@ -19,14 +18,11 @@ $outfile = PerlACE::LocalFile ("output"); $debug = 0; -# generate test stream data -$input = PerlACE::generate_test_file("test_input", 102400); - unlink $nsior; -for ($i = 0; $i <= $#ARGV; $i++) +for ($i = 0; $i <= $#ARGV; $i++) { - if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") + if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { print STDERR "\nusage: run_test\n"; @@ -45,12 +41,12 @@ for ($i = 0; $i <= $#ARGV; $i++) exit; } - elsif ($ARGV[$i] eq "-p") + elsif ($ARGV[$i] eq "-p") { @protocols = split (',', $ARGV[$i + 1]); $i++; } - elsif ($ARGV[$i] eq "-d") + elsif ($ARGV[$i] eq "-d") { $debug = $ARGV[$i + 1]; $i++; @@ -63,10 +59,10 @@ print STDERR "Starting Naming Service\n"; $NS->Spawn (); -if (PerlACE::waitforfile_timed ($nsior, 100) == -1) +if (PerlACE::waitforfile_timed ($nsior, 100) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } @@ -83,26 +79,26 @@ for $protocol (@protocols) } $SV = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -f ".$output_file); - $CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol." -f $input"); - + $CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol); + print STDERR "Using ".$protocol."\n"; print STDERR "Starting Receiver\n"; - + $SV->Spawn (); - + sleep $sleeptime; - + print STDERR "Starting Sender\n"; - + $sender = $CL->SpawnWaitKill (200); - + if ($sender != 0) { print STDERR "ERROR: sender returned $sender\n"; $status = 1; } - + $receiver = $SV->TerminateWaitKill (200); - + if ($receiver != 0) { print STDERR "ERROR: receiver returned $receiver\n"; $status = 1; @@ -117,6 +113,6 @@ if ($nserver != 0) { } unlink $nsior; -unlink $output, $input; +unlink $output; exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h index 32cbf2856c9..c89e0c9d1eb 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/input b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/input new file mode 100644 index 00000000000..b71b9f74fab --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/input @@ -0,0 +1,995 @@ +#---------------------------------------------------------------------------- +# $Id$ +# +# Top-level Makefile for Pluggable testing of AVStreams of TAO. +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO + +SERVER_OBJS = server.o +CLIENT_OBJS = ftp.o + +VLDLIBS = $(LDLIBS:%=%$(VAR)) + +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + +FILES = ftp server +DEFS = $(addsuffix .h,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) + +BIN2 = server ftp + +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV + +#---------------------------------------------------------------------------- +# 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.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +#DCFLAGS = -g +LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \ + -I$(TAO_ROOT) + +#server:$(addprefix $(VDIR),$(SERVER_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +#ftp:$(addprefix $(VDIR),$(CLIENT_OBJS)) +# $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/ftp.o .obj/ftp.so .shobj/ftp.o .shobj/ftp.so: ftp.cpp ftp.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Services.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/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.inl \ + $(ACE_ROOT)/ace/Stats.i + +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + $(ACE_ROOT)/ace/ATM_Addr.h \ + $(ACE_ROOT)/ace/ATM_Addr.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.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/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(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/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(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.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + $(ACE_ROOT)/ace/Process_Semaphore.h \ + $(ACE_ROOT)/ace/Process_Semaphore.inl \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.h \ + $(ACE_ROOT)/ace/Basic_Stats.inl \ + $(ACE_ROOT)/ace/Stats.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h index 91af15eaa33..31291ac620d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Receiver_Callback : public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl index d8bde72c0f5..5dd90188fa6 100755 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl @@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../../bin'; use PerlACE::Run_Test; -use File::stat; # amount of delay between running the servers @@ -19,14 +18,11 @@ $outfile = PerlACE::LocalFile ("output"); $debug = 0; -# generate test stream data -$input = PerlACE::generate_test_file("test_input", 102400); - unlink $nsior; -for ($i = 0; $i <= $#ARGV; $i++) +for ($i = 0; $i <= $#ARGV; $i++) { - if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") + if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { print STDERR "\nusage: run_test\n"; @@ -45,12 +41,12 @@ for ($i = 0; $i <= $#ARGV; $i++) exit; } - elsif ($ARGV[$i] eq "-p") + elsif ($ARGV[$i] eq "-p") { @protocols = split (',', $ARGV[$i + 1]); $i++; } - elsif ($ARGV[$i] eq "-d") + elsif ($ARGV[$i] eq "-d") { $debug = $ARGV[$i + 1]; $i++; @@ -63,10 +59,10 @@ print STDERR "Starting Naming Service\n"; $NS->Spawn (); -if (PerlACE::waitforfile_timed ($nsior, 100) == -1) +if (PerlACE::waitforfile_timed ($nsior, 100) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } @@ -83,26 +79,26 @@ for $protocol (@protocols) } $SV = new PerlACE::Process ("receiver", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -f ".$output_file); - $CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol." -f $input"); - + $CL = new PerlACE::Process ("sender", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol); + print STDERR "Using ".$protocol."\n"; print STDERR "Starting Receiver\n"; - + $SV->Spawn (); - + sleep $sleeptime; - + print STDERR "Starting Sender\n"; - + $sender = $CL->SpawnWaitKill (200); - + if ($sender != 0) { print STDERR "ERROR: sender returned $sender\n"; $status = 1; } - + $receiver = $SV->TerminateWaitKill (200); - + if ($receiver != 0) { print STDERR "ERROR: receiver returned $receiver\n"; $status = 1; @@ -117,6 +113,6 @@ if ($nserver != 0) { } unlink $nsior; -unlink $output, $input; +unlink $output; exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h index a314624ed28..6d92b5776d2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint { diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc index 99300dbb59d..750a79f00ef 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc @@ -1,10 +1,11 @@ // -*- MPC -*- // $Id$ -project(Bug_1630_testclient ) : taoexe, minimum_corba { +project(Bug_1630_testclient ) : taoexe { exename = testclient libs += TAO_IFR_Client libpaths += $(TAO_ROOT)/tao/IFR_Client $(TAO_ROOT)/tao $(ACE_ROOT)/ace + avoids += minimum_corba IDL_Files { } diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.h b/TAO/orbsvcs/tests/Concurrency/CC_client.h index a81df69daa0..5c945b65f10 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.h @@ -24,8 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosConcurrencyControlC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "CC_tests.h" #include "CC_naming_service.h" #include "CC_command.h" diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp index fe4a1467fe1..e502874a740 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -20,8 +20,7 @@ #include "CC_naming_service.h" #include "ace/ACE.h" #include "ace/Process.h" -#include "ace/Log_Msg.h" -#include "orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h index 735d38d7c21..9992d80c6f7 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h @@ -20,7 +20,7 @@ // // ============================================================================ -#include "orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" #ifndef _CC_COMMAND_H_ #define _CC_COMMAND_H_ diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index 8a67df0eb67..2b161c63d94 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -30,7 +30,7 @@ #include "CC_command.h" #include "ace/ACE.h" -#include "orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" #include "ace/OS_NS_stdio.h" void ace_cc_yyerror (const char* s); diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp index d12cb0d1e94..fe0f28fef32 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp @@ -19,7 +19,6 @@ #include "CC_naming_service.h" #include "ace/OS_NS_string.h" -#include "ace/Log_Msg.h" ACE_RCSID(Concurrency, CC_naming_service, "$Id$") diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h index 597a9696840..3dfbcff8b44 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h @@ -18,9 +18,9 @@ // // ============================================================================ -#include "orbsvcs/CosConcurrencyControlC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/Naming_Client.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" #ifndef _CC_NAMING_SERVICE_H_ #define _CC_NAMING_SERVICE_H_ diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp index 8559173030b..baf8c02bdda 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp @@ -20,7 +20,6 @@ #include "CC_test_utils.h" #include "CC_naming_service.h" #include "ace/OS.h" -#include "ace/Log_Msg.h" ACE_RCSID(Concurrency, CC_test_utils, "$Id$") diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h index 4c1a643f863..95a4605d582 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h @@ -17,7 +17,7 @@ // // ============================================================================ -#include "orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" #ifndef _CC_TEST_UTILS_H_ #define _CC_TEST_UTILS_H_ diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp index 01af67d07b7..d4e132a0617 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp @@ -19,8 +19,6 @@ #include "CC_tests.h" #include "ace/OS.h" -#include "ace/Log_Msg.h" - ACE_RCSID(Concurrency, CC_tests, "$Id$") CC_Test::CC_Test (CC_naming_service *ns) diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.h b/TAO/orbsvcs/tests/Concurrency/CC_tests.h index 9f0083fd2ad..7417c23235d 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_tests.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.h @@ -18,8 +18,8 @@ // // ============================================================================ -#include "orbsvcs/CosConcurrencyControlC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "CC_naming_service.h" #ifndef _CC_TESTS_H_ diff --git a/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp b/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp index ecddc658428..3c8d0dcdd5f 100644 --- a/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp +++ b/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp @@ -5,7 +5,7 @@ // The contents of this file REALLY should be generated by the IDL // compiler, but that functionality isn't available yet. -#include "orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" ACE_RCSID(Concurrency, tmplinst, "$Id$") diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp index 4c3faefd58f..7b6b3cb0345 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp @@ -3,9 +3,9 @@ #include "Counting_Supplier.h" #include "Counting_Consumer.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" ACE_RCSID (CEC_Tests, Disconnect, diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp index cb87203f303..a31c7a75652 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp @@ -4,8 +4,8 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" ACE_RCSID (CEC_Tests, MT_Disconnect, diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h index 06a263e9178..a6e077c91cc 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h @@ -18,7 +18,7 @@ #define CEC_MT_DISCONNECT_H #include "ace/Task.h" -#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp index abaa9184f9b..ce3a0ee4b2d 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp @@ -2,8 +2,8 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (CEC_Tests_Basic, diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp index 3ff9f720233..a0ebb93aef3 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp @@ -2,8 +2,8 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (CEC_Tests_Basic, diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index 0c5aea70a2f..d74044224ce 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -1,8 +1,8 @@ // $Id$ #include "Random.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Arg_Shifter.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h index 450fe418668..d40b29ab84a 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h @@ -17,8 +17,8 @@ #ifndef EC_RANDOM_H #define EC_RANDOM_H -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "ace/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp index eee8e47f1a3..2a63a37184c 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp @@ -2,8 +2,8 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" ACE_RCSID( CEC_Tests_Basic, Shutdown, diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb index 2065860ebb8..d4105cbe2a9 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb +++ b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, messaging, taoserver, event_serv, naming, svc_utils, iortable { +project : orbsvcsexe, messaging, taoserver, event, naming, svc_utils, iortable { after += CosEvent_Test_Lib libs += CECTests includes += ../lib diff --git a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc index f3c8fe6d235..ccca6133222 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc +++ b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosEvent Test Lib): orbsvcslib, event_skel, naming, svc_utils, iortable, portableserver { +project(CosEvent Test Lib): orbsvcslib, event, naming, svc_utils, iortable, portableserver { sharedname = CECTests dynamicflags = CEC_TEST_BUILD_DLL Header_Files { diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h index d3ec2cbbb33..fbcc070662d 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h @@ -23,8 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" #include "ace/Task.h" class CEC_Test_Export CEC_Counting_Consumer : public POA_CosEventComm::PushConsumer diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h index 5f557db27ee..c33b963a13e 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h @@ -23,8 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" #include "ace/Task.h" class CEC_Test_Export CEC_Counting_Supplier : public POA_CosEventComm::PushSupplier diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index a84b5e24821..6e3a7cb607a 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -3,10 +3,10 @@ #include "ECM_Consumer.h" #include "ECM_Data.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "tao/Timeprobe.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h index 1d0adde39fd..5b266e18c7b 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h @@ -17,8 +17,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/OS_NS_time.h" class Driver; diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 1ef30218a5f..de6f6b043e3 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -8,10 +8,10 @@ #include "tao/Timeprobe.h" #include "tao/CDR.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ECM_Supplier.h" #include "ECM_Data.h" #include "ace/OS_NS_errno.h" diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h index 10b3adb9270..1aa98e8bea8 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h @@ -17,7 +17,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" class ECMS_Driver; diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h index 232f63a5071..d0be5f4851c 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h @@ -5,7 +5,7 @@ #define ADDRSERVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" class AddrServer : public POA_RtecUDPAdmin::AddrServer { diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp index 23e8b6b0e2a..b43c33fd181 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp @@ -2,8 +2,8 @@ // Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast #include "Consumer.h" -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" ACE_RCSID(EC_MT_Mcast, Consumer, diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h index 1e1d9fdaa17..415b4b19eea 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h @@ -4,8 +4,8 @@ #ifndef CONSUMER_H #define CONSUMER_H -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp index 6fbed6275f2..67512d83d65 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp @@ -4,13 +4,13 @@ #include "Consumer.h" #include "Supplier.h" #include "AddrServer.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/ECG_Mcast_EH.h" -#include "orbsvcs/Event/ECG_UDP_Sender.h" -#include "orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp index 851d74512e0..38ee3a1f8f5 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp @@ -2,8 +2,8 @@ // Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast #include "Supplier.h" -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" ACE_RCSID(EC_MT_Mcast, Supplier, diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h index 8f9f50f2a87..b2618c5d810 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h @@ -4,8 +4,8 @@ #ifndef SUPPLIER_H #define SUPPLIER_H -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 2746a69f222..16d1cab1b1f 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -2,12 +2,12 @@ #include "EC_Mcast.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h index a1044cb15aa..c7e4d93e777 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h @@ -53,15 +53,15 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/High_Res_Timer.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/Event/ECG_UDP_Sender.h" -#include "orbsvcs/Event/EC_UDP_Admin.h" -#include "orbsvcs/Event/ECG_Mcast_EH.h" -#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h" -#include "orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/Event/ECG_UDP_Sender.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h" +#include "orbsvcs/orbsvcs/Event/EC_UDP_Admin.h" +#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h" class ECM_Driver; diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 08196317846..1f2e5c7c3a4 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -6,14 +6,14 @@ #include "Scheduler_Runtime2.h" #include "Scheduler_Runtime_Dynamic.h" /* infos_3 */ -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/Runtime_Scheduler.h" -#include "orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/orbsvcs/Runtime_Scheduler.h" +#include "orbsvcs/orbsvcs/Event/Event_Channel.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h index 4bf7784e0cd..e3491190859 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h @@ -23,11 +23,11 @@ #include "ace/High_Res_Timer.h" #include "ace/Condition_Thread_Mutex.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/Event/EC_Gateway_Sched.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" class Test_ECG; diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h index a6de5dd6f1d..d5e25a0cafa 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h +++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h @@ -2,7 +2,7 @@ // before editing the file please consider generating it again // $Id$ -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_1[] = { { "Reactor_Task-25000.us", 1, 0, 0, 0, 250000, diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h index 44b87de3f80..3e89bc2e87b 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h +++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h @@ -2,7 +2,7 @@ // before editing the file please consider generating it again // $Id$ -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_2[] = { { "Reactor_Task-25000.us", 1, 0, 0, 0, 250000, diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h index 86089e80ff4..44a0458b555 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h +++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h @@ -2,7 +2,7 @@ // before editing the file please consider generating it again // $Id$ -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_3[] = { { "Reactor_Task-25000.us", 1, 0, 0, 0, 250000, (RtecScheduler::Criticality_t) 4, (RtecScheduler::Importance_t) 0, 0, 1, 59, 1022, 0, (RtecScheduler::Info_Type_t) 0 , (RtecScheduler::RT_Info_Enabled_Type_t) RtecScheduler::RT_INFO_ENABLED }, diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp index 1c262087f3e..548da9e2e8b 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp @@ -2,9 +2,9 @@ #include "ECT_Consumer.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/Timeprobe.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h index 6a086b38087..e5c69dd1ad5 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h @@ -19,9 +19,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Task.h" #include "ace/OS_NS_time.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index 5c4ef131935..366639f8332 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -2,10 +2,10 @@ #include "ECT_Consumer_Driver.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/Timeprobe.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h index 4af70e0f7a8..ba33ea4adef 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h @@ -20,8 +20,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ECT_Consumer.h" -#include "orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Task.h" #include "ace/High_Res_Timer.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp index 4e687d7a67b..4012a5b8130 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp @@ -2,9 +2,9 @@ #include "ECT_Supplier.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/Timeprobe.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h index 17fbcb8ce02..ee5dcf255d2 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h @@ -18,9 +18,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "ace/Task.h" class Test_Supplier : public ACE_Task<ACE_SYNCH> diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index cf4ff7d1d1b..082b1bfa826 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -2,10 +2,10 @@ #include "ECT_Supplier_Driver.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/Timeprobe.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h index e51f0f73551..e295690f6e5 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h @@ -19,7 +19,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/High_Res_Timer.h" -#include "orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" #include "ECT_Driver.h" #include "ECT_Supplier.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index 9d5395e9569..21fe2ee77e3 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -2,16 +2,16 @@ #include "ECT_Throughput.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/Runtime_Scheduler.h" -#include "orbsvcs/Event/Event_Channel.h" -#include "orbsvcs/Event/Module_Factory.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/orbsvcs/Runtime_Scheduler.h" +#include "orbsvcs/orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" #include "tao/Timeprobe.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index d7e4362d17c..308906f4f86 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -5,10 +5,10 @@ #include "ace/OS_NS_unistd.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" ACE_RCSID (EC_Tests, Atomic_Reconnect, diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h index 6aafd6e9dce..93b84af5c2d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h @@ -14,7 +14,7 @@ #define EC_ATOMIC_RECONNECT_H #include "Counting_Consumer.h" -#include "orbsvcs/Channel_Clients.h" +#include "orbsvcs/orbsvcs/Channel_Clients.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index 9ea02908ff1..4e085a1df56 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -3,7 +3,7 @@ #include "BCast.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/Event/ECG_Mcast_Gateway.h" +#include "orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h" #include "tao/ORB_Core.h" #include "ace/Arg_Shifter.h" #include "ace/INET_Addr.h" diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h index 8cbcfa4c368..5ec95b193a8 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.h +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h @@ -14,7 +14,7 @@ #define EC_BCAST_H #include "Driver.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" class ACE_INET_Addr; diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp index 784bb9e422f..2e9c750ccf5 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp @@ -3,10 +3,10 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" ACE_RCSID (EC_Tests, Bitmask, diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp index 5a021eb4e08..5beec0820a2 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp @@ -2,10 +2,10 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" ACE_RCSID (EC_Tests, Complex, diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index cdc7369cbac..0962fd2b630 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -5,10 +5,10 @@ #include "ace/OS_NS_unistd.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" ACE_RCSID (EC_Tests, Control, diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h index 2df1cb7e3ea..ac641891b4b 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.h +++ b/TAO/orbsvcs/tests/Event/Basic/Control.h @@ -14,7 +14,7 @@ #define EC_CONTROL_H #include "Counting_Consumer.h" -#include "orbsvcs/Channel_Clients.h" +#include "orbsvcs/orbsvcs/Channel_Clients.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp index 22af3ce4a99..425e6b97eca 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp @@ -3,10 +3,10 @@ #include "Counting_Supplier.h" #include "Counting_Consumer.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" ACE_RCSID (EC_Tests, Disconnect, diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp index 39c750d1a4d..d908603bb20 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp @@ -2,11 +2,11 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h" ACE_RCSID (EC_Tests, Gateway, diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp index 51d2bd3c3fb..f2349ee5a21 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -4,10 +4,10 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" ACE_RCSID (EC_Tests, MT_Disconnect, diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h index 06855260d66..03e058934e1 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h @@ -14,7 +14,7 @@ #define EC_MT_DISCONNECT_H #include "ace/Task.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp index 83fbdf77e04..44a50a10b13 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp @@ -3,10 +3,10 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" ACE_RCSID (EC_Tests, Negation, diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index afb1653bab4..58253b839bd 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -3,8 +3,8 @@ #include "Observer.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" #include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h index bb788c01258..13ae141293c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.h +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h @@ -14,7 +14,7 @@ #define EC_OBSERVER_H #include "Driver.h" -#include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index b9397f997ed..f7bb82adc85 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -1,10 +1,10 @@ // $Id$ #include "Random.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "ace/Arg_Shifter.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h index 22fd387192b..727806f0be0 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.h +++ b/TAO/orbsvcs/tests/Event/Basic/Random.h @@ -13,8 +13,8 @@ #ifndef EC_RANDOM_H #define EC_RANDOM_H -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #include "ace/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index 7bb4b36492f..ba63f91ba2d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -3,7 +3,7 @@ #include "Reconnect.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp index aa7906a0cd9..79fbf4580fe 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp @@ -3,10 +3,10 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" ACE_RCSID (EC_Tests, Timeout, diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp index af77cc9fcbd..868ff9b95f2 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp @@ -2,10 +2,10 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" ACE_RCSID (EC_Tests, Wildcard, diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp index 5fe05170a84..33207f3d371 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp @@ -1,7 +1,7 @@ // $Id$ #include "EC_Wrapper.h" -#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "ace/Auto_Ptr.h" EC_Wrapper::EC_Wrapper (void) diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h index a8421c9334e..22b1f7a328e 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h @@ -4,8 +4,8 @@ #ifndef EC_WRAPPER_H #define EC_WRAPPER_H -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h" #include "ECMcastTests_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp index 667ac9e8efb..8c33c404bb5 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp @@ -1,9 +1,9 @@ // $Id$ #include "Gateway_EC.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/ECG_Mcast_Gateway.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h" +#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h" #include "ace/Get_Opt.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h index bc1faae8c3b..f4471a4eaa6 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #define A_EVENT_TYPE ACE_ES_EVENT_UNDEFINED+1 #define B_EVENT_TYPE A_EVENT_TYPE+1 diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index d04907a35f1..ffdb42a1858 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -1,10 +1,10 @@ // $Id$ #include "Constants.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" class EC_Consumer: public POA_RtecEventComm::PushConsumer, diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp index ab13f1a28ef..37d8edcaa0d 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp @@ -1,9 +1,9 @@ // $Id$ #include "Constants.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/RtecEventCommC.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Log_Msg.h" void diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h index 45bca620bf2..f5093028608 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #define EVENT_TYPE ACE_ES_EVENT_UNDEFINED+1 #define SOURCE_ID ACE_ES_EVENT_SOURCE_ANY+1 diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp index d7d0b4f1973..069a9d8701d 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp @@ -1,9 +1,9 @@ // $Id$ #include "Constants.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/RtecEventCommC.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Log_Msg.h" void diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h index 6a6919f964d..2e5814a3957 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #define HEARTBEAT ACE_ES_EVENT_UNDEFINED+1 #define SOURCE_ID ACE_ES_EVENT_SOURCE_ANY+1 diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index fabc0999002..1ef97c20ec3 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -2,13 +2,13 @@ #include "Constants.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" -#include "orbsvcs/Event/ECG_UDP_Sender.h" -#include "orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index afb5e07dc4d..1860291e40d 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -3,7 +3,7 @@ #include "Connect.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp index 1d78d070ce7..b1f33edb93b 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -3,8 +3,8 @@ #include "Inversion.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "ace/Sched_Params.h" #include "ace/Arg_Shifter.h" diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index 23c11650fd9..7d0a54f78c6 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Latency.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "tao/Messaging/Messaging.h" #include "tao/Strategies/advanced_resource.h" diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h index 3b6880e36b5..365e21bcf2c 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.h +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h @@ -17,8 +17,8 @@ #ifndef EC_LATENCY_H #define EC_LATENCY_H -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index 875bbf1803d..0b79f385e8a 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" #include "tao/Messaging/Messaging.h" #include "tao/Strategies/advanced_resource.h" diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index 67c7ce2277f..31ae3910a5d 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -3,7 +3,7 @@ #include "Throughput.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "ace/Get_Opt.h" ACE_RCSID (EC_Tests_Performance, diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp index 50a090f74c5..3be234ab90f 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp @@ -1,8 +1,8 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h index 439b95f9747..ce3c6678d39 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/OS_NS_time.h" /** diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h index 06878cb4b9f..482a9afc68e 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" /** * @class EC_Counting_Consumer diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp index 4b63fcae605..712c6a15215 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Counting_Supplier.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (EC_Tests, diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h index cc76b3a6e91..da4b7f67172 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Channel_Clients.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Channel_Clients.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Task.h" /** diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index e80efa46881..a359c8a570e 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -4,10 +4,10 @@ #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h index c902b4a7052..b6165e14ab4 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.h +++ b/TAO/orbsvcs/tests/Event/lib/Driver.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #include "ace/Stats.h" #include "ace/Task.h" diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index a644d926bb6..97a49df7d5d 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -1,8 +1,8 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "tao/debug.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h index 065a20a15aa..9f4b5820fb1 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Task.h" #include "ace/OS_NS_time.h" diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp index b23e08cf1ae..7416446bbe6 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp @@ -13,7 +13,7 @@ //============================================================================= #include "tao/Utils/Server_Main.h" -#include "orbsvcs/PortableGroup/PG_FactoryRegistry.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/FT_App/FT_App.mpc b/TAO/orbsvcs/tests/FT_App/FT_App.mpc index 6ce793d80df..9b9fbca1e5b 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_App.mpc +++ b/TAO/orbsvcs/tests/FT_App/FT_App.mpc @@ -1,7 +1,8 @@ // $Id$ -project(*Server): taoserver, fault_tolerance, orbsvcsexe, minimum_corba { +project(*Server): taoserver, fault_tolerance, orbsvcsexe{ exename = ft_replica + avoids += minimum_corba Source_Files { FT_Replica.cpp FT_TestReplica_i.cpp @@ -34,8 +35,9 @@ project(*Server): taoserver, fault_tolerance, orbsvcsexe, minimum_corba { } } -project(*Client): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { +project(*Client): taoclient, fault_tolerance, orbsvcsexe { exename = ft_client + avoids += minimum_corba includes += $(TAO_ROOT) after += *Server Source_Files { @@ -45,8 +47,9 @@ project(*Client): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { } } -project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe, minimum_corba { +project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe { exename = ft_notifier + avoids += minimum_corba Source_Files { FTAPP_Notifier_Main.cpp StubFaultNotifier.cpp @@ -59,7 +62,7 @@ project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe, minimum_co } } -project(*Analyzer): taoclient, fault_tolerance, notification_skel, orbsvcsexe { +project(*Analyzer): taoclient, fault_tolerance, orbsvcsexe { exename = ft_analyzer Source_Files { @@ -76,8 +79,9 @@ project(*Analyzer): taoclient, fault_tolerance, notification_skel, orbsvcsexe { } } -project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcsexe, minimum_corba { +project(*FaultConsumer): taoserver, fault_tolerance, orbsvcsexe { exename = ft_fault_consumer + avoids += minimum_corba libs += TAO_ReplicationManagerLib after += FT_ReplicationManager_Lib Source_Files { @@ -92,8 +96,9 @@ project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcse } } -project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { +project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe { exename = ft_registry + avoids += minimum_corba Source_Files { FTAPP_FactoryRegistry_Main.cpp @@ -109,8 +114,9 @@ project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe, minimum_corba } } -project(*Creator): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { +project(*Creator): taoclient, fault_tolerance, orbsvcsexe { exename = ft_create + avoids += minimum_corba Source_Files { FT_Creator.cpp @@ -125,8 +131,9 @@ project(*Creator): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { } } -project(*RMController): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { +project(*RMController): taoclient, fault_tolerance, orbsvcsexe { exename = replmgr_controller + avoids += minimum_corba Source_Files { FT_ReplicationManagerController.cpp } diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index db1f0cd28a2..29e711b4ac1 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -15,7 +15,7 @@ #include "FT_Creator.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" -#include <orbsvcs/PortableGroup/PG_Properties_Encoder.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h> #include <ace/Get_Opt.h> #include <ace/OS_NS_stdio.h> diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index 1c10cfed7aa..bfe9a4790e1 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -14,10 +14,10 @@ #include "FT_TestReplica_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/PortableGroup/PG_Property_Set.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h" // Use this macro at the beginning of CORBA methods // to aid in debugging. diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h index a2bc85e5f80..0db1f6d948c 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h @@ -30,7 +30,7 @@ class FT_ReplicaFactory_i; #include <ace/Vector_T.h> #include "FT_TestReplicaS.h" #include <ace/Thread_Manager.h> -#include <orbsvcs/FT_ReplicationManagerC.h> +#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h> ///////////////////// // Forward references diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp index 0af57a70274..57f2789169d 100755 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/FT_ReplicationManagerC.h" +#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h" #include <ace/Get_Opt.h> // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl b/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl index b9d41ed7429..7df01cb3cfc 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl @@ -14,7 +14,7 @@ #ifndef FT_TESTREPLICA_IDL #define FT_TESTREPLICA_IDL -#include "orbsvcs/FT_Replica.idl" +#include "orbsvcs/orbsvcs/FT_Replica.idl" module FT_TEST { diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp index 66e48bc950c..b60de378ad5 100755 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp @@ -4,7 +4,7 @@ #include "ReplicationManagerFaultConsumerAdapter.h" #include "ace/Get_Opt.h" -#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" #include "orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h index 0d0833f7755..b06a41469cb 100755 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h @@ -10,8 +10,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include <orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h> -#include <orbsvcs/FT_NotifierC.h> -#include <orbsvcs/FT_FaultDetectorFactoryC.h> +#include <orbsvcs/orbsvcs/FT_NotifierC.h> +#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h> #include <ace/Vector_T.h> ///////////////////// diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp index 2ed7b7baca0..f2bec9e8df6 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp @@ -5,7 +5,7 @@ #include "StubBatchConsumer.h" #include "ace/Get_Opt.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubBatchConsumer::StubBatchConsumer () : quit_(0) diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h index d81d9fa061c..d7183f6c7f0 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h @@ -10,8 +10,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include <orbsvcs/CosNotifyChannelAdminS.h> -#include <orbsvcs/FT_NotifierC.h> +#include <orbsvcs/orbsvcs/CosNotifyChannelAdminS.h> +#include <orbsvcs/orbsvcs/FT_NotifierC.h> ////////////////////// // Forward references diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index f66171dec1a..cbcb441ae9e 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp @@ -5,7 +5,7 @@ #include "StubFaultAnalyzer.h" #include "ace/Get_Opt.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h index 7da34e52cba..d617e9c4845 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h @@ -12,8 +12,8 @@ #include "StubFaultConsumer.h" #include "StubBatchConsumer.h" -#include <orbsvcs/FT_NotifierC.h> -#include <orbsvcs/FT_FaultDetectorFactoryC.h> +#include <orbsvcs/orbsvcs/FT_NotifierC.h> +#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h> #include "ace/Vector_T.h" diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp index 33c4491e7f1..016f086f327 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp @@ -5,7 +5,7 @@ #include "StubFaultConsumer.h" #include "ace/Get_Opt.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubFaultConsumer::StubFaultConsumer () : quit_(0) diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h index 374b2e7b588..630bad0d6e9 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h @@ -10,8 +10,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include <orbsvcs/FT_NotifierC.h> +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include <orbsvcs/orbsvcs/FT_NotifierC.h> ////////////////////// // Forward references diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index 47b2453d95e..64f1adf3bb5 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp @@ -6,7 +6,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h index b939dbdf74b..32e738a8b92 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h @@ -11,8 +11,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ <ace/pre.h> -#include <orbsvcs/FT_NotifierS.h> -#include <orbsvcs/FT_FaultDetectorFactoryC.h> +#include <orbsvcs/orbsvcs/FT_NotifierS.h> +#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h> #include <ace/Vector_T.h> ////////////////////// diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp index 3939bb548ac..b82140602e6 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp @@ -14,9 +14,9 @@ #include "TAO_Object_Group_Creator.h" #include <ace/OS_NS_stdio.h> -#include <orbsvcs/PortableGroup/PG_Properties_Encoder.h> -#include <orbsvcs/FT_FaultDetectorFactoryC.h> -#include <orbsvcs/PortableGroup/PG_Operators.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h> +#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Operators.h> #include <ace/Get_Opt.h> diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h index 5bf6c6aae58..f987d0b45ac 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h @@ -20,8 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include <orbsvcs/FT_ReplicationManagerC.h> -#include <orbsvcs/PortableGroupC.h> +#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h> +#include <orbsvcs/orbsvcs/PortableGroupC.h> #include <ace/SString.h> #include <ace/Vector_T.h> diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc index 8dc4ef24e24..ed0d52a13c5 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc @@ -3,7 +3,7 @@ project(*Server): taoserver, orbsvcsexe, iormanip, ftorb, messaging{ requires += interceptors - idlflags += -DCORBA3 -I$(TAO_ROOT) + idlflags += -Gv -DCORBA3 -I$(TAO_ROOT) Source_Files { test_i.cpp @@ -17,7 +17,7 @@ project(*Server): taoserver, orbsvcsexe, iormanip, ftorb, messaging{ project(*Client): taoclient, orbsvcsexe, iormanip, ftorb { requires += interceptors - idlflags += -DCORBA3 -I$(TAO_ROOT) + idlflags += -Gv -DCORBA3 -I$(TAO_ROOT) Source_Files { testC.cpp diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp index 4c9d10a1936..53b36402947 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- #include "Server_Request_Interceptor.h" -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" #include "tao/ORB_Constants.h" #include "tao/CDR.h" #include "testS.h" diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp index 82ac5cdec4b..800f6eacbfa 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp @@ -2,7 +2,7 @@ #include "ace/Get_Opt.h" #include "testC.h" -#include "orbsvcs/FaultTolerance/FT_Service_Activate.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h" ACE_RCSID (Group_Ref_Manip, client, diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index ee1bd7e9d0e..5d959174ed5 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp @@ -10,9 +10,9 @@ #include "Server_Request_Interceptor.h" #include "tao/IORManipulation/IORManipulation.h" #include "tao/ORBInitializer_Registry.h" -#include "orbsvcs/FaultTolerance/FT_Service_Activate.h" -#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" ACE_RCSID (ForwardRequest, server, diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 543da3eff4f..3cb915df554 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -6,8 +6,8 @@ #include "ace/Read_Buffer.h" #include "tao/IORManipulation/IORManip_Loader.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/FaultTolerance/FT_Service_Activate.h" -#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_fcntl.h" diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp index 72014970c1d..9d85a48410e 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp @@ -18,8 +18,8 @@ //========================================================================= #include "tao/ORB.h" -#include "orbsvcs/FT_CORBA_ORBC.h" -#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" ACE_RCSID(IOGRManipluation, IOGRTest, diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp index bb03eff19a1..0d5a1bd90e0 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_sys_time.h" #include "PushConsumer.h" -#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h" #include <stdio.h> ACE_RCSID (FtRtEvent, diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h index 11c5601a36e..330cb279194 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h @@ -12,7 +12,7 @@ #ifndef PUSHCONSUMERIMPL_H #define PUSHCONSUMERIMPL_H -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" class PushConsumer_impl : public virtual POA_RtecEventComm::PushConsumer diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp index 8c1b1757ecf..cb16b1b042f 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "PushSupplier.h" #include "ace/Reactor.h" #include "ace/Select_Reactor.h" #include "tao/MProfile.h" #include "tao/Stub.h" -#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h" ACE_RCSID (FtRtEvent, PushSupplier, diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h index b286fd96926..1307b2d27b7 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h @@ -12,8 +12,8 @@ #ifndef PUSHSUPPLIER_H #define PUSHSUPPLIER_H -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Event_Handler.h" #include "ace/Task.h" #include "ace/Reactor.h" diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp index 8fabe5d60d4..52afdd7fddb 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp @@ -1,18 +1,18 @@ // $Id$ -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "PushConsumer.h" #include "ace/Get_Opt.h" -#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" -#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" /// include this file to statically linked with FT ORB -#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h" /// include this file to statically linked with Transaction Depth -#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" +#include "orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" ACE_RCSID (FtRtEvent, PushConsumer, diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp index bd0b1bf3238..d2383d84e9c 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp @@ -1,16 +1,16 @@ // $Id$ -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" #include "PushSupplier.h" #include "ace/Get_Opt.h" -#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" -#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" /// include this file to statically linked with FT ORB -#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h" /// include this file to statically linked with Transaction Depth -#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" +#include "orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" ACE_RCSID (FtRtEvent, supplier, diff --git a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc index ae73b4ba0d3..0949799b83d 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc +++ b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*server): namingexe, iortable, svc_utils { +project(*server): namingexe { Source_Files { server_i.cpp MCast_Server_i.cpp @@ -9,7 +9,7 @@ project(*server): namingexe, iortable, svc_utils { } } -project(*client): namingexe, iortable, svc_utils { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp index be8c6ab97c8..829cb75d232 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp @@ -9,17 +9,18 @@ int main (int argc, char *argv[]) { Server_i svr_i; - const int init_result = svr_i.init (argc, argv ACE_ENV_ARG_PARAMETER); + int init_result; + + init_result = svr_i.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (init_result != 0) return 1; } - ACE_CATCHANY + ACE_CATCH (CORBA::SystemException, ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "CORBA exception raised in server!"); + ACE_PRINT_EXCEPTION (ex, "CORBA exception raised in server!"); } ACE_ENDTRY; ACE_CHECK_RETURN (-1); diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h index 35844172cac..40a13661091 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h +++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h @@ -5,7 +5,7 @@ #ifndef SERVER_I_H #define SERVER_I_H -#include "orbsvcs/IOR_Multicast.h" +#include "orbsvcs/orbsvcs/IOR_Multicast.h" class Server_i { diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl index 037a604d364..2fe7ca7d7e6 100755 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl @@ -13,17 +13,13 @@ use PerlACE::Run_Test; $imr_ior = PerlACE::LocalFile ("imr.ior"); $name_ior = PerlACE::LocalFile ("name.ior"); -$activator_ior = PerlACE::LocalFile("activator.ior"); $IMR = new PerlACE::Process ("../../../ImplRepo_Service/ImplRepo_Service"); -$ACTIVATOR = new PerlACE::Process("../../../ImplRepo_Service/ImR_Activator"); $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service"); -$TAO_IMR = new PerlACE::Process ("../../../../../bin/tao_imr"); +$TAO_IMR = new PerlACE::Process ("../../../ImplRepo_Service/tao_imr"); $TEST = new PerlACE::Process ("test"); -$imr_init_ref = "-ORBInitRef ImplRepoService=file://$imr_ior"; - ################################################################################ $errors = 0; @@ -34,32 +30,22 @@ unlink $name_ior; ################################################################################ ## Start the implementation Repository -$IMR->Arguments ("-o $imr_ior -d 1"); +$IMR->Arguments ("-o $imr_ior -d 0"); $IMR->Spawn (); -if (PerlACE::waitforfile_timed ($imr_ior, 10) == -1) { +if (PerlACE::waitforfile_timed ($imr_ior, 5) == -1) { print STDERR "ERROR: waiting for $imr_ior\n"; $IMR->Kill (); exit 1; } -$ACTIVATOR->Arguments("-d 1 -o $activator_ior $imr_init_ref"); -$ACTIVATOR->Spawn(); - -if (PerlACE::waitforfile_timed ($activator_ior, 10) == -1) { - print STDERR "ERROR: waiting for $activator_ior\n"; - $IMR->Kill (); - $ACTIVATOR->Kill(); - exit 1; -} - ################################################################################ ## Register the NameService -$TAO_IMR->Arguments("$imr_init_ref" +$TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_ior" . " add NameService " ." -c \"" . $NS->Executable () - ." $imr_init_ref" + ." -ORBInitRef ImplRepoService=file://$imr_ior" ." -ORBUseIMR 1 .\""); $taoimr = $TAO_IMR->SpawnWaitKill (60); @@ -72,7 +58,8 @@ if ($taoimr != 0) { ################################################################################ ## Create IOR for NameService -$TAO_IMR->Arguments ("$imr_init_ref ior NameService -f $name_ior"); +$TAO_IMR->Arguments ("-ORBInitRef ImplRepoService=file://$imr_ior" + . " ior NameService -f $name_ior"); $taoimr = $TAO_IMR->SpawnWaitKill (60); @@ -111,13 +98,6 @@ if ($taoimr != 0) { ################################################################################ ## Kill the IMR -$iserver = $ACTIVATOR->TerminateWaitKill (5); - -if ($iserver != 0) { - print STDERR "ERROR: ImR_Activator returned $iserver\n"; - ++$errors; -} - $iserver = $IMR->TerminateWaitKill (5); if ($iserver != 0) { diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp index b885f1b28ed..defc5e21897 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp @@ -2,7 +2,7 @@ // $Id$ // -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Log_Msg.h" diff --git a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl index 099f5fdad62..d13886d8d87 100755 --- a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl @@ -17,7 +17,7 @@ $pfile = PerlACE::LocalFile ("persistence.dat"); $IMR_LOCATOR = new PerlACE::Process ("../../../ImplRepo_Service/ImplRepo_Service"); $IMR_ACTIVATOR = new PerlACE::Process ("../../../ImplRepo_Service/ImR_Activator"); -$TAO_IMR = new PerlACE::Process ("../../../../../bin/tao_imr"); +$TAO_IMR = new PerlACE::Process ("../../../ImplRepo_Service/tao_imr"); ################################################################################ @@ -57,7 +57,7 @@ if (PerlACE::waitforfile_timed ($imr_activator_ior, 10) == -1) { print "===== Adding a server\n"; $TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_locator_ior" - . " add Foo -c foobarbaz"); + . " add Foo -c foobarbaz"); $taoimr = $TAO_IMR->SpawnWaitKill (60); diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl index ea222c7e56b..d3cf4ddd45f 100755 --- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl @@ -41,7 +41,7 @@ $endpoint = "-ORBEndpoint " . "$protocol" . "://" . "$host" . ":" . $port; $IMR_LOCATOR = new PerlACE::Process ("../../ImplRepo_Service/ImplRepo_Service"); $IMR_ACTIVATOR = new PerlACE::Process ("../../ImplRepo_Service/ImR_Activator"); -$TAO_IMR = new PerlACE::Process("$ACE_ROOT/bin/tao_imr"); +$TAO_IMR = new PerlACE::Process("../../ImplRepo_Service/tao_imr"); $A_SVR = new PerlACE::Process (PerlACE::LocalFile ("airplane_server")); $A_CLI = new PerlACE::Process (PerlACE::LocalFile ("airplane_client"), @@ -133,7 +133,7 @@ sub nt_service_test my $result = 0; # Just to show that it's possible, this test uses corbaloc instead of ior file. - my $imr_initref = "-orbinitref ImplRepoService=corbaloc::localhost:8888/ImplRepoService"; + my $imr_initref = "-orbinitref ImplRepoService=corbaloc::localhost:8888/ImplRepoService"; # To avoid having to ensure that they LocalSystem account has the correct path # we simply copy the imr executables to the same directory as the DLL's. @@ -575,7 +575,7 @@ sub persistent_ir_test $status = 1; } - return $status; + return $status; } ############################################################################### @@ -610,7 +610,7 @@ sub both_ir_test . " -ORBUseIMR 1 $refstyle -o $nestea_ior $imr_initref\""); $TAO_IMR->SpawnWaitKill (10); - $TAO_IMR->Arguments ("$imr_initref add airplane_server -c \"" + $TAO_IMR->Arguments ("$imr_initref add airplane_server -c \"" . $A_SVR->Executable () . " -ORBUseIMR 1 $refstyle -o $airplane_ior $imr_initref\""); $TAO_IMR->SpawnWaitKill (10); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc index 3396f7a98fe..2c14a302961 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project(*server): taoexe, portableserver, ifr_client, minimum_corba { +project(*server): taoexe, portableserver, ifr_client { + avoids += minimum_corba Source_Files { test_i.cpp @@ -9,7 +10,8 @@ project(*server): taoexe, portableserver, ifr_client, minimum_corba { } } -project(*client): taoexe, portableserver, ifr_client, dynamicinterface, minimum_corba { +project(*client): taoexe, portableserver, ifr_client, dynamicinterface { + avoids += minimum_corba IDL_Files { } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl index 6ddd8f3fee1..d6831078350 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl @@ -14,6 +14,22 @@ $ifr_iorfile= "if_repo.ior"; $svr_iorfile = "iorfile"; $test_idl = PerlACE::LocalFile ("test.idl"); +# find the tao_ifr executable. +# Its placement is dependent upon the OS and if MPC generated makefiles are used. +my $exec_extn=""; +if ($^O eq "MSWin32") { + $exec_extn=".exe"; +} + +$tao_ifr = "../../../../../bin/tao_ifr"; +if (! -e $tao_ifr . $exec_extn ) { + $tao_ifr = "../../../IFR_Service/tao_ifr"; + if (! -e $tao_ifr . $exec_extn ) { + print STDERR "ERROR: tao_ifr compiler not found.\n"; + exit 1; + } +} + $lookup_by_name = ""; $other = ""; @@ -26,7 +42,7 @@ for ($i = 0; $i <= $#ARGV; $i++) { } } -$TAO_IFR = new PerlACE::Process ("../../../../../bin/tao_ifr"); +$TAO_IFR = new PerlACE::Process ($tao_ifr); $IFR = new PerlACE::Process ("../../../IFR_Service/IFR_Service", " -o $ifr_iorfile"); $SV = new PerlACE::Process ("server", "-ORBInitRef InterfaceRepository=file://$ifr_iorfile"); $CL = new PerlACE::Process ("client", "-ORBInitRef InterfaceRepository=file://$ifr_iorfile" diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc index e1f0a71cc46..a34e2eafcf1 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project: taoexe, ifr_client, minimum_corba { +project: taoexe, ifr_client { + avoids += minimum_corba exename = IDL3_Test Source_Files { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc index c351c9ef039..722bf26f64d 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc @@ -1,6 +1,7 @@ // -*- MPC -*- // $Id$ -project: taoexe, ifr_client, minimum_corba { +project: taoexe, ifr_client { + avoids += minimum_corba exename = IFR_Test } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc index 57112a88744..d9ae7520f6b 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc @@ -1,6 +1,7 @@ // -*- MPC -*- // $Id$ -project: taoexe, ifr_client, minimum_corba { +project: taoexe, ifr_client { + avoids += minimum_corba exename = Persistence_Test } diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc index 831fed1a8d3..42c4e3b8849 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc +++ b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project: namingexe, portableserver { +project: namingexe { exename = client -} +}
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h index 930aeaf426a..11f367176f8 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h @@ -24,7 +24,7 @@ #define NCONTEXTEXT_CLIENT_I_H #include "Web_ServerC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" class NContextExt_Client_i { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h index 6e061d588c4..6ddc01606b7 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h @@ -6,8 +6,8 @@ #define BASIC_H #include "TestS.h" -#include "orbsvcs/CosLoadBalancingC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #if defined (_MSC_VER) # if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h index c82ed1c073b..c3567cc2ce3 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h @@ -12,8 +12,8 @@ //============================================================================= -#include "orbsvcs/CosLoadBalancingC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "tao/PortableServer/PortableServer.h" // Forward Declaration of the kind of servant we would like to handle diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h index 5b0513e2e5f..ead0fe0230e 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h @@ -6,7 +6,7 @@ #define FACTORY_H #include "Factory_Map.h" -#include "orbsvcs/PortableGroupS.h" +#include "orbsvcs/orbsvcs/PortableGroupS.h" #include "ace/Null_Mutex.h" #if defined (_MSC_VER) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h index 9b0513431dc..eec9e8e1133 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h @@ -12,8 +12,8 @@ //============================================================================= -#include "orbsvcs/CosLoadBalancingC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "tao/PortableServer/PortableServer.h" /** diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h index c0a82d6a630..20a8851d235 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h @@ -6,8 +6,8 @@ #define BASIC_H #include "TestS.h" -#include "orbsvcs/CosLoadBalancingC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #if defined (_MSC_VER) # if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h index dd8366cf547..f258bdfdee5 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h @@ -12,8 +12,8 @@ //============================================================================= -#include "orbsvcs/CosLoadBalancingC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "tao/PortableServer/PortableServer.h" // Forward Declaration of the kind of servant we would like to handle diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h index d023b875a7e..70000152112 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h @@ -6,8 +6,8 @@ #define SIMPLE_H #include "TestS.h" -#include "orbsvcs/CosLoadBalancingC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #if defined (_MSC_VER) # if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index 78b92cc6fc3..e8f5116c435 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -1,6 +1,6 @@ #include "Basic_Log_Test.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h index 031c19ba769..e60b1ecddc5 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h @@ -17,8 +17,8 @@ #ifndef TAO_BASIC_LOG_TEST_H #define TAO_BASIC_LOG_TEST_H -#include "orbsvcs/DsLogAdminC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/DsLogAdminC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" class BasicLog_Test { diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am index d3602d257d0..b1655fe84c6 100644 --- a/TAO/orbsvcs/tests/Makefile.am +++ b/TAO/orbsvcs/tests/Makefile.am @@ -1,40 +1,42 @@ +##--------------------------------------------------------------------------- +## $Id$ +## +## Top-level Makefile for TAO's ORB Services Tests +## +##--------------------------------------------------------------------------- + +## ## Process this file with automake to create Makefile.in +## + +## The number in AUTOMAKE_OPTIONS is the minimum required version automake +## needed to process this file. +AUTOMAKE_OPTIONS = 1.4 SUBDIRS = \ AVStreams \ - Bug_1334_Regression \ - Bug_1393_Regression \ - Bug_1395_Regression \ - Bug_1630_Regression \ Concurrency \ - CosEvent \ + CosEC_Basic \ + CosEC_Multiple \ EC_Custom_Marshal \ - EC_MT_Mcast \ EC_Mcast \ + EC_MT_Mcast \ EC_Multiple \ EC_Throughput \ - Event \ - FT_App \ - FaultTolerance \ - FtRtEvent + ImplRepo \ + Logger \ + Property \ + Sched \ + Sched_Conf \ + Simple_Naming \ + Redundant_Naming \ + Simulator \ + Time \ + Trading \ + Log \ + RTCosScheduling + +noinst_SCRIPTS = start_services -# IOR_MCast \ -# ImplRepo \ -# InterfaceRepo \ -# Interoperable_Naming \ -# LoadBalancing \ -# Log \ -# Miop \ -# Notify \ -# Property \ -# RTCosScheduling \ -# Redundant_Naming \ -# Sched \ -# Sched_Conf \ -# Security \ -# Simple_Naming \ -# Time \ -# Trading \ -# ior_corbaname \ -# tests_svc_loader +EXTRA_DIST = $(noinst_SCRIPTS) diff --git a/TAO/orbsvcs/tests/Miop/McastHello/README b/TAO/orbsvcs/tests/Miop/McastHello/README index 2b7205b555d..d96228dc866 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/README +++ b/TAO/orbsvcs/tests/Miop/McastHello/README @@ -15,20 +15,4 @@ $ ./run_test.pl the script returns 0 if the test was successful. -The test has some unique features that should be noted by -users. Firstly, server.cpp includes MIOP.h, which has some magic for -loading MIOP protocol in static builds. Secondly, the svc.conf has -a directive for loading the right protocol factory. Both of them are -required for static builds in addition to linking with the -TAO_PortableGroup library. - -However for dynamic builds things are different - -. One need not include MIOP.h. Including MIOP.h will require linking - in the TAO_PortableGroup library - -. The entries in the svc.conf should have dynamic directives. In - svc.conf you would be required to remove commented parts and run - the test. - */ diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.conf b/TAO/orbsvcs/tests/Miop/McastHello/client.conf new file mode 100644 index 00000000000..75accdd4d58 --- /dev/null +++ b/TAO/orbsvcs/tests/Miop/McastHello/client.conf @@ -0,0 +1,2 @@ +dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() "" +static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory" diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp index 10180538dbf..c0fa7328e6a 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp @@ -2,8 +2,8 @@ #include "TestC.h" #include "ace/Get_Opt.h" + #include "tao/Object_T.h" -#include "orbsvcs/PortableGroup/MIOP.h" ACE_RCSID(Hello, client, "$Id$") diff --git a/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl b/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl index 316cf14a560..ef87c284d2d 100755 --- a/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl +++ b/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl @@ -14,9 +14,12 @@ unlink $iorfile; unlink $iorfile_server2; $status = 0; -$SV1 = new PerlACE::Process ("server", "-o $iorfile"); -$SV2 = new PerlACE::Process ("server", "-o $iorfile_server2 "); -$CL = new PerlACE::Process ("client", " -k file://$iorfile "); +$server_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext"); +$client_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext"); + +$SV1 = new PerlACE::Process ("server", "-o $iorfile -ORBsvcconf $server_conf"); +$SV2 = new PerlACE::Process ("server", "-o $iorfile_server2 -ORBsvcconf $server_conf"); +$CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBsvcconf $client_conf"); $SV1->Spawn (); $SV2->Spawn (); diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.conf b/TAO/orbsvcs/tests/Miop/McastHello/server.conf new file mode 100644 index 00000000000..38dd6e5896c --- /dev/null +++ b/TAO/orbsvcs/tests/Miop/McastHello/server.conf @@ -0,0 +1,4 @@ +dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() "" +static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory" +#static PortableGroup_Loader "" +dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp index c71f26760f2..711a9f53f1c 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp @@ -3,7 +3,6 @@ #include "McastHello.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -#include "orbsvcs/PortableGroup/MIOP.h" ACE_RCSID (McastHello, server, @@ -79,8 +78,6 @@ main (int argc, char *argv[]) // Get the group IOR. CORBA::String_var ior = CORBA::string_dup (group_ior); - - CORBA::Object_var group1 = orb->string_to_object (ior.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc index f41844762f9..eae38394313 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc +++ b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc @@ -8,13 +8,13 @@ project(*Notify ConnectDisconnect): notifytest { } -project(*Notify LifeCycle): notifytest { +project(*Notify LifeCycle): notifytest, naming { Source_Files { LifeCycle.cpp } } -project(*Notify IdAssignment): notifytest { +project(*Notify IdAssignment): notifytest, naming { Source_Files { IdAssignment.cpp } diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp index d6e52a015d8..6d96f438923 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp @@ -3,8 +3,8 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" #include "tao/debug.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "IdAssignment.h" ACE_RCSID (Notify_Tests, diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h index 7b4a7e3920f..581fa2be9b5 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h @@ -16,7 +16,7 @@ #ifndef IDASSIGNMENT_H #define IDASSIGNMENT_H -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" class IdAssignment { diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp index 4f48407b6af..bf7a29af1e4 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp @@ -3,9 +3,9 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" #include "tao/debug.h" -#include <orbsvcs/CosNamingC.h> -#include <orbsvcs/CosNotifyCommC.h> -#include <orbsvcs/CosNotifyChannelAdminC.h> +#include <orbsvcs/orbsvcs/CosNamingC.h> +#include <orbsvcs/orbsvcs/CosNotifyCommC.h> +#include <orbsvcs/orbsvcs/CosNotifyChannelAdminC.h> #include "LifeCycle.h" diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h index 19352ec0150..fd234dcc6e5 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h @@ -19,7 +19,7 @@ #include "Notify_Test_Client.h" #include "Notify_SequencePushConsumer.h" #include "Notify_SequencePushSupplier.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp index 475e5719d0d..c930e066381 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" #include "Notify_Structured_Push_Consumer.h" -#include "orbsvcs/Notify/Notify_Extensions.h" +#include "orbsvcs/orbsvcs/Notify/Notify_Extensions.h" #include "common.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h index 8041f156b35..86b160c2e0a 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h @@ -19,7 +19,7 @@ #define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H #include "Notify_StructuredPushConsumer.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" class Notify_Structured_Push_Consumer: public TAO_Notify_Tests_StructuredPushConsumer { diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp index 97db6fc7f80..bae1c684bf7 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp @@ -7,9 +7,9 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Notify_Structured_Push_Consumer.h" #include "goC.h" diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp index 03c7ce9214a..d1220a50e02 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp @@ -8,10 +8,10 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Notify_StructuredPushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp index c88d7dc082d..be72b75214f 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp @@ -2,8 +2,8 @@ #include "common.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.h b/TAO/orbsvcs/tests/Notify/Blocking/common.h index 0e37aa80491..aaa7826b07f 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/common.h +++ b/TAO/orbsvcs/tests/Notify/Blocking/common.h @@ -18,7 +18,7 @@ #ifndef TAO_COMMON_H #define TAO_COMMON_H -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" const char* Any_String (const CORBA::Any& any); diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp index b437d7b75e3..c829b8efa06 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp +++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp @@ -1,7 +1,7 @@ //$Id$ #include "../lib/Notify_Test_Client.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "ace/OS_main.h" int diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp index 4ad43dcb356..7e752c1189f 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" #include "Notify_Sequence_Push_Consumer.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp index 46516422f0f..8e5713ebb2d 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp @@ -7,8 +7,8 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Sequence_Push_Consumer.h" #include "goC.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp index 427fc996aea..79cf4ff3634 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp @@ -8,10 +8,10 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Notify_SequencePushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp index 18563673738..fe185bd3254 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp @@ -7,8 +7,8 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Structured_Push_Consumer.h" #include "goC.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp index 47302392e00..050a2976d53 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp @@ -8,10 +8,10 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Notify_StructuredPushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp index c88d7dc082d..be72b75214f 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp @@ -2,8 +2,8 @@ #include "common.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.h b/TAO/orbsvcs/tests/Notify/Discarding/common.h index 0e37aa80491..aaa7826b07f 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/common.h +++ b/TAO/orbsvcs/tests/Notify/Discarding/common.h @@ -18,7 +18,7 @@ #ifndef TAO_COMMON_H #define TAO_COMMON_H -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" const char* Any_String (const CORBA::Any& any); diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp index 1486816ff5e..5e7b8b6f034 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp @@ -6,8 +6,8 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Structured_Push_Consumer.h" #include "goC.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp index f50a5bc3846..80f3d3ad428 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp @@ -8,9 +8,9 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_StructuredPushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp index 94fdf02c5c1..f6dc8e42ab5 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" #include "Notify_Sequence_Push_Consumer.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp index 0e2973152ad..588d83caffc 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" #include "Notify_Structured_Push_Consumer.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp index ca6de9a909a..ad410ec2af8 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp @@ -7,8 +7,8 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Sequence_Push_Consumer.h" #include "goC.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp index f689cb5b866..0434804c2be 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp @@ -9,10 +9,10 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Notify_SequencePushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp index b06369cba80..a2c96e61b66 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp @@ -7,8 +7,8 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Structured_Push_Consumer.h" #include "goC.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp index de8e0d5aae6..cd1c1b579b4 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp @@ -9,10 +9,10 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Notify_StructuredPushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp index c88d7dc082d..be72b75214f 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp @@ -2,8 +2,8 @@ #include "common.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.h b/TAO/orbsvcs/tests/Notify/Ordering/common.h index 679adb0a42c..54ce6c9720a 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/common.h +++ b/TAO/orbsvcs/tests/Notify/Ordering/common.h @@ -18,7 +18,7 @@ #ifndef TAO_COMMON_H #define TAO_COMMON_H -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" const char* Any_String (const CORBA::Any& any); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp index 188dc2a032c..4a3ac0a1c4d 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" #include "Notify_Sequence_Push_Consumer.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp index ac2b673cd99..a2bfacea20d 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp @@ -7,8 +7,8 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Sequence_Push_Consumer.h" #include "goC.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp index 62127227df9..a99fcaa6aec 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp @@ -8,10 +8,10 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Notify_SequencePushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp index c88d7dc082d..be72b75214f 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp @@ -2,8 +2,8 @@ #include "common.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h index 0e37aa80491..aaa7826b07f 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h @@ -18,7 +18,7 @@ #ifndef TAO_COMMON_H #define TAO_COMMON_H -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" const char* Any_String (const CORBA::Any& any); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp index 5b3e48d271f..509fe631c00 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" #include "Notify_Sequence_Push_Consumer.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp index 9cc7a728152..e64fd49f725 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp @@ -7,8 +7,8 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Sequence_Push_Consumer.h" #include "goC.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp index a6c6bac9662..6f2a32690c9 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp @@ -11,9 +11,9 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_SequencePushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp index c88d7dc082d..be72b75214f 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp @@ -2,8 +2,8 @@ #include "common.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h index 0e37aa80491..aaa7826b07f 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h @@ -18,7 +18,7 @@ #ifndef TAO_COMMON_H #define TAO_COMMON_H -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" const char* Any_String (const CORBA::Any& any); diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc index 2bfe6d28614..de96c575df2 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Ntf Struct Supp): notifytest { +project(*Ntf Struct Supp): notifytest, naming { exename = Structured_Supplier Source_Files { @@ -9,7 +9,7 @@ project(*Ntf Struct Supp): notifytest { } } -project(*Ntf Struct Cons): notifytest { +project(*Ntf Struct Cons): notifytest, naming { exename = Structured_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp index 54406640c59..622080e1b27 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp @@ -7,9 +7,9 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "controlC.h" #include "Notify_Push_Consumer.h" #include "Notify_Test_Client.h" diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp index 74a90e7f845..fba45d19f79 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp @@ -4,9 +4,9 @@ // Include Section // ****************************************************************** -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_StructuredPushSupplier.h" #include "controlS.h" #include "Notify_Test_Client.h" diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc index 2c9b03fe5ca..b2962f5fba2 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Ntf Struct Supp): notifytest { +project(*Ntf Struct Supp): notifytest, naming { exename = Structured_Supplier Source_Files { @@ -10,7 +10,7 @@ project(*Ntf Struct Supp): notifytest { } } -project(*Ntf Struct Cons): notifytest { +project(*Ntf Struct Cons): notifytest, naming { exename = Structured_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp index 1673dd1975a..915ce0f8e61 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp @@ -7,9 +7,9 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "controlC.h" #include "Notify_Push_Consumer.h" #include "Notify_Test_Client.h" diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp index 829bc0b9b08..8b4d62ec7b7 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp @@ -5,9 +5,9 @@ // ****************************************************************** #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Push_Supplier.h" #include "controlS.h" #include "Notify_Test_Client.h" diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h index 4b2e1021bdb..0efa9039997 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h index dd0588a2543..75d395824ae 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyFilterS.h" -#include "orbsvcs/Notify/FilterFactory.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/orbsvcs/Notify/FilterFactory.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc index 1964722a76f..3967e5772d7 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(TAO_RT_NotifyTests_Filter): orbsvcslib, notification_skel, rtcorba, etcl, dynamicany, portableserver, iortable { +project(TAO_RT_NotifyTests_Filter): orbsvcslib, notification, rtcorba, etcl, dynamicany, portableserver, iortable { sharedname = TAO_RT_NotifyTests_Filter diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h index a94146e47bc..429cfe0ca99 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SString.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" /** diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h index 1a07e216014..1a94c4f4291 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h @@ -20,9 +20,9 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SString.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" -//#include "../../../orbsvcs/Notify/CosNotify_Initializer.h" +#include "../../../orbsvcs/Notify/CosNotify_Initializer.h" class TAO_Notify_Service; diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h index 2678b6c4437..24e263b908c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SString.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" /** diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h index 6cd7f1da60d..bba40b99762 100644 --- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h +++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h @@ -21,8 +21,8 @@ #include "ace/Singleton.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Hash_Map_Manager.h" class TAO_Notify_Tests_Periodic_Supplier; diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h index 60a1e436d08..b85f6540d86 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h @@ -16,9 +16,9 @@ #ifndef NOTIFY_TEST_CLIENT_H #define NOTIFY_TEST_CLIENT_H -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "notify_test_export.h" class TAO_NOTIFY_TEST_Export Notify_Test_Client diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc index b4a0aacf126..c2cb98ffa63 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(NotifyTests_Lib): orbsvcslib, notification_skel, naming, svc_utils { +project(NotifyTests_Lib): orbsvcslib, notification, naming { sharedname = TAO_NotifyTests dynamicflags = TAO_NOTIFY_TEST_BUILD_DLL } diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp index 2134941a87f..0a257ceed2d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp @@ -7,7 +7,7 @@ ACE_RCSID (lib, "$Id$") #include "tao/debug.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" TAO_Notify_Tests_Options_Parser::TAO_Notify_Tests_Options_Parser (void) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h index 7acd1919324..6cdc20933b0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Arg_Shifter.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" /** * @class TAO_Notify_Tests_Options_Parser diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp index 293218f1ae5..f6e11655d40 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp @@ -14,7 +14,7 @@ ACE_RCSID (lib, #include "Name.h" #include "LookupManager.h" #include "Options_Parser.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" TAO_Notify_Tests_Peer::TAO_Notify_Tests_Peer (void) : poa_name_ (TAO_Notify_Tests_Name::root_poa) diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h index 3273306214b..2df32f45f92 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "tao/PortableServer/PortableServer.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp index 279291b2db2..8a042567060 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp @@ -17,7 +17,7 @@ ACE_RCSID (Notify, #include "Name.h" #include "LookupManager.h" #include "Options_Parser.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" template <class Peer_Traits> TAO_Notify_Tests_Peer_T<Peer_Traits>::TAO_Notify_Tests_Peer_T (void) diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp index 66d655dd9b6..116f4d7fedf 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp @@ -5,7 +5,7 @@ #include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" #include "tao/debug.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "StructuredEvent.h" #include "Task_Stats.h" #include "Task_Callback.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp index 7b3e5527ed7..78929ec2730 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp @@ -13,7 +13,7 @@ ACE_RCSID (lib, #include "Direct_Consumer.h" #include "Activation_Manager.h" #include "Options_Parser.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" TAO_Notify_Tests_Periodic_Consumer_Command::TAO_Notify_Tests_Periodic_Consumer_Command (void) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h index d258c7e2e8a..977c0f22f64 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SString.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" class TAO_Notify_Tests_Periodic_Consumer; diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp index f637105b924..ded6a360841 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp @@ -8,7 +8,7 @@ #include "ace/OS_NS_unistd.h" #include "tao/debug.h" #include "tao/ORB_Core.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "StructuredEvent.h" #include "Task_Stats.h" #include "Task_Callback.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp index 0378605ffea..6b97740e3ca 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp @@ -12,7 +12,7 @@ ACE_RCSID (lib, #include "Direct_Supplier.h" #include "Activation_Manager.h" #include "Options_Parser.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" TAO_Notify_Tests_Periodic_Supplier_Command::TAO_Notify_Tests_Periodic_Supplier_Command (void) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h index 726d7cd0ddd..a03215cb7b4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SString.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" class TAO_Notify_Tests_Periodic_Supplier; diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h index 5aae9203447..4c624eb407b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "Consumer_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h index edf2753e87d..bce5a9a9c9e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "Supplier_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h index 7e4a4773b27..a462f94db79 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "Consumer_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h index dad8bd6d0eb..441348257e3 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "Supplier_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h index dddecec4dc1..a2a5b236df8 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" /** * @class TAO_Notify_Tests_StructuredEvent diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h index 43ee9ffec52..a83edf24f79 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "Consumer_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h index e1c11dc6a54..e7c04d2e82d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "Supplier_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h index fbed3172551..10c011ee66d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SString.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" /** diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc index 0c726ed4014..3bc2661b6b9 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc @@ -1,12 +1,14 @@ // $Id$ -project(*Ntf Perf Struct Supp): notifytest, minimum_corba { +project(*Ntf Perf Struct Supp): notifytest { + avoids += minimum_corba exename = Structured_Supplier Source_Files { Structured_Supplier.cpp } } -project(*Ntf Perf Struct Cons): notifytest, minimum_corba { +project(*Ntf Perf Struct Cons): notifytest { + avoids += minimum_corba exename = Structured_Consumer Source_Files { goC.cpp @@ -16,14 +18,16 @@ project(*Ntf Perf Struct Cons): notifytest, minimum_corba { } } -project(*Ntf Perf Seq Supp): notifytest, minimum_corba { +project(*Ntf Perf Seq Supp): notifytest { + avoids += minimum_corba exename = Sequence_Supplier Source_Files { Sequence_Supplier.cpp } } -project(*notify perf Sequence Consumer): notifytest, minimum_corba { +project(*notify perf Sequence Consumer): notifytest { + avoids += minimum_corba exename = Sequence_Consumer Source_Files { goC.cpp diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp index 1ff4cb087c0..a0cfc9f8a46 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp @@ -6,8 +6,8 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Sequence_Push_Consumer.h" #include "goC.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp index 124dca8a155..cff6c00dfe3 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp @@ -8,9 +8,9 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_SequencePushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp index 8c543bd6b44..541266d8cd1 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp @@ -6,8 +6,8 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Structured_Push_Consumer.h" #include "goC.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp index c3cc5ac0f4a..5644e71b127 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp @@ -8,9 +8,9 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_StructuredPushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp index c88d7dc082d..be72b75214f 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp @@ -2,8 +2,8 @@ #include "common.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h index 0e37aa80491..aaa7826b07f 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h @@ -18,7 +18,7 @@ #ifndef TAO_COMMON_H #define TAO_COMMON_H -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" const char* Any_String (const CORBA::Any& any); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc index 619fd2e21b9..8f78c3f2121 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(*Ntf Perf RedGreen): notifytest { +project(*Ntf Perf RedGreen): notifytest, naming { exename = RedGreen_Test } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp index cbb435d4295..1dcc9f2e98a 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -4,7 +4,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/debug.h" ACE_RCSID (Notify, diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index a6d83524294..6759d3bc543 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -17,9 +17,9 @@ #ifndef NOTIFY_RedGreen_Test_CLIENT_H #define NOTIFY_RedGreen_Test_CLIENT_H -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Task.h" #include "ace/Stats.h" #include "ace/High_Res_Timer.h" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 24c72c47766..a298517a58d 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -9,8 +9,8 @@ #include "ace/Dynamic_Service.h" #include "tao/Strategies/advanced_resource.h" #include "tao/Messaging/Messaging.h" -#include "orbsvcs/Notify/Service.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Notify/Service.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" ACE_RCSID (Notify_Tests, Throughput, diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc index b16923c43da..d645c76001a 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc @@ -1,6 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Ntf Perf Throughput): notifytest, strategies, messaging, minimum_corba { +project(*Ntf Perf Throughput): notifytest, strategies, messaging, naming { + avoids += minimum_corba exename = Throughput } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf index 0515ecbd0db..8706e4bd882 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf @@ -1,2 +1,2 @@ -dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () "" -dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () "" +dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () "" +dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () "" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf index a747c353448..aa0e93c02df 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf @@ -1,3 +1,3 @@ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" -dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () "" +dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () "" dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf index 0515ecbd0db..8706e4bd882 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf @@ -1,2 +1,2 @@ -dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () "" -dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () "" +dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () "" +dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () "" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf index a747c353448..aa0e93c02df 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf @@ -1,3 +1,3 @@ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" -dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () "" +dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () "" dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf index cc59624b3fb..acb3f6fee00 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf @@ -3,7 +3,7 @@ # Note that this test is not portable because it does not use RTCORBA. # All priority values are for Linux # -dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () "" +dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () "" ##---- Load the Factories------ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf index fcaa0f1cc8f..33d916bf88f 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf @@ -2,7 +2,7 @@ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" -dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () "" +dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () "" dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf index 61456d1a199..b9b7b4b50cc 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf @@ -1,2 +1,2 @@ -dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () "" +dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () "" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf index a747c353448..aa0e93c02df 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf @@ -1,3 +1,3 @@ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" -dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () "" +dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () "" dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf index 0515ecbd0db..8706e4bd882 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf @@ -1,2 +1,2 @@ -dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () "" -dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () "" +dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () "" +dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () "" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf index a747c353448..aa0e93c02df 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf @@ -1,3 +1,3 @@ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" -dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () "" +dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () "" dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h index 4845eb5a324..9ff5ad078b2 100644 --- a/TAO/orbsvcs/tests/Property/client.h +++ b/TAO/orbsvcs/tests/Property/client.h @@ -30,8 +30,8 @@ #include "ace/Thread_Manager.h" #include "ace/Get_Opt.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/Property/CosPropertyService_i.h" -#include "orbsvcs/Naming/Naming_Client.h" +#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" class Client { diff --git a/TAO/orbsvcs/tests/Property/server.h b/TAO/orbsvcs/tests/Property/server.h index 0ddad8b9aae..afe9808e3bf 100644 --- a/TAO/orbsvcs/tests/Property/server.h +++ b/TAO/orbsvcs/tests/Property/server.h @@ -21,7 +21,7 @@ #define COSPROPERTYSERVICE_SERVER_H #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/Property/CosPropertyService_i.h" -#include "orbsvcs/Naming/Naming_Client.h" +#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" #endif /* COSPROPERTYSERVICE_SERVER_H */ diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp index 5ee39f1c23a..1ad8bfc30f2 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp @@ -12,7 +12,7 @@ #include "testSchedC.h" -#include <orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h> +#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h> #include "ace/Get_Opt.h" #include "tao/debug.h" #include "tao/Version.h" diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp index ae46946ce65..7df823caafc 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp @@ -11,7 +11,7 @@ //============================================================================= #include "Object1_i.h" -#include <orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h> +#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h> #include "tao/Version.h" diff --git a/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc b/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc index bbeedbc28fb..18f3e669754 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc +++ b/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Client) : namingexe, portableserver { +project(*Client) : namingexe { exename = client } diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 3d93dfff3bb..786f53ab34b 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -17,8 +17,8 @@ // ============================================================================ #include "test_objectS.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/Naming_Server.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" #include "tao/PortableServer/ORB_Manager.h" #include "tao/debug.h" #include "ace/Get_Opt.h" diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp index fe06daf6ba8..4b580b8ed46 100644 --- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp +++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/Sched/Strategy_Scheduler.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #if defined (ACE_HAS_QUANTIFY) # include <quantify.h> #endif /* ACE_HAS_QUANTIFY */ diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp index 2737124fdf9..74272df5877 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp @@ -6,10 +6,9 @@ #include "ace/Sched_Params.h" #include "ace/Get_Opt.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/Naming/Naming_Server.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" ACE_RCSID (Sched_Conf, Sched_Conf, diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp index fff85f45219..fe655323b89 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp @@ -9,7 +9,7 @@ #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Naming/Naming_Server.h" +#include "orbsvcs/Naming/Naming_Utils.h" ACE_RCSID(Sched_Conf, Sched_Conf_Anomalies, "$Id$") diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp index b6107a0a062..d65ee46ec55 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp @@ -10,7 +10,7 @@ #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Naming/Naming_Server.h" +#include "orbsvcs/Naming/Naming_Utils.h" #include "Sched_Conf_Runtime.h" diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc index 1ab4d83b7e1..03c1d64f0d0 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*security server): orbsvcslib, portableserver, ssl, ssliop { +project(*security server): orbsvcsexe, portableserver, ssl, ssliop { Source_Files { Server_Worker.cpp test_i.cpp @@ -9,7 +9,7 @@ project(*security server): orbsvcslib, portableserver, ssl, ssliop { } } -project(*security client): orbsvcslib { +project(*security client): orbsvcsexe, ssl { Source_Files { testC.cpp Client_Worker.cpp diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp index c2b447fab3a..618d490c664 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp @@ -5,7 +5,7 @@ #include "tao/ORB_Core.h" #include "tao/Thread_Lane_Resources.h" #include "tao/Transport_Cache_Manager.h" -#include "orbsvcs/SSLIOP/SSLIOP_Transport.h" +#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h" #include "ace/OS_NS_unistd.h" #if !defined(__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h index 144006f317e..3188c58be17 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h @@ -16,7 +16,7 @@ #define SECURE_INVOCATION_FOO_I_H #include "FooS.h" -#include "orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/orbsvcs/SecurityLevel3C.h" class Foo_i : public virtual POA_Foo::Bar , public virtual PortableServer::RefCountServantBase diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc index 187ce8a2f7b..6ec5ebfe5de 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*security server): taoexe, portableserver, orbsvcslib, security, ssliop { +project(*security server): taoexe, portableserver, orbsvcsexe, security, ssl { Source_Files { Foo_i.cpp server.cpp } } -project(*security client): taoexe, orbsvcslib, security { +project(*security client): taoexe, orbsvcsexe, security, ssl { Source_Files { FooC.cpp client.cpp diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp index ea861c51cd2..cfc5da04d59 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp @@ -3,7 +3,7 @@ #include "ace/Get_Opt.h" #include "FooC.h" -#include "orbsvcs/SecurityC.h" +#include "orbsvcs/orbsvcs/SecurityC.h" ACE_RCSID (Secure_Invocation, client, diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h index 4243f3ab3dc..4fd7687a525 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h @@ -16,7 +16,7 @@ #define TAO_SLEVEL1_TEST_I_H #include "SLevel1_TestS.h" -#include "orbsvcs/SecurityLevel1C.h" +#include "orbsvcs/orbsvcs/SecurityLevel1C.h" #include "openssl/x509.h" class SLevel1_Server_i : public POA_SLevel1_Server diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc index 4ba28eda246..b6d7f968d50 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*security server): taoexe, portableserver, orbsvcslib, ssl, security { +project(*security server): taoexe, portableserver, orbsvcsexe, ssl, security { Source_Files { SLevel1_Test_i.cpp server.cpp } } -project(*security client): taoexe { +project(*security client): taoexe, orbsvcsexe, ssl, security { Source_Files { SLevel1_TestC.cpp client.cpp diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc index 97620a0feb0..f7a14d12a38 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc +++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Client) : namingexe, portableserver { +project(*Client) : namingexe { Source_Files { client.cpp } diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h index 15eb7fe577e..94e0c1c5ae7 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.h +++ b/TAO/orbsvcs/tests/Simple_Naming/client.h @@ -18,8 +18,8 @@ // ============================================================================ #include "test_objectS.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/Naming_Client.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" #include "tao/PortableServer/ORB_Manager.h" #include "ace/Task.h" diff --git a/TAO/orbsvcs/tests/Time/Client_i.h b/TAO/orbsvcs/tests/Time/Client_i.h index 66062dace39..8d00d712578 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.h +++ b/TAO/orbsvcs/tests/Time/Client_i.h @@ -18,8 +18,8 @@ // // ============================================================================ -#include "orbsvcs/TimeServiceC.h" -#include "orbsvcs/Naming/Naming_Client.h" +#include "orbsvcs/orbsvcs/TimeServiceC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" class Client_i { diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp index 690b329a7d7..764d016bdf5 100644 --- a/TAO/orbsvcs/tests/Time/client.cpp +++ b/TAO/orbsvcs/tests/Time/client.cpp @@ -1,7 +1,6 @@ // $Id$ #include "Client_i.h" -#include "ace/Log_Msg.h" ACE_RCSID(Time, client, "$Id$") diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h index 2a5e78885b3..a4d447cb7d7 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Trader/Trader_Utils.h" +#include "orbsvcs/orbsvcs/Trader/Trader_Utils.h" #include "ttest_export.h" class TAO_TTest_Export TAO_Offer_Importer diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h index 28cf7b442dd..b18406139fb 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h @@ -16,7 +16,7 @@ #ifndef TAO_SIMPLE_DYNAMIC_H #define TAO_SIMPLE_DYNAMIC_H -#include "orbsvcs/Trader/Trader_Utils.h" +#include "orbsvcs/orbsvcs/Trader/Trader_Utils.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp index dfd8d90740e..c19395fb428 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp +++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp @@ -1,7 +1,7 @@ // $Id$ #include "TT_Info.h" -#include "orbsvcs/Trader/Trader_Utils.h" +#include "orbsvcs/orbsvcs/Trader/Trader_Utils.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h index de4935df75c..d6f776e7465 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.h +++ b/TAO/orbsvcs/tests/Trading/TT_Info.h @@ -6,9 +6,9 @@ #include "TTestS.h" #include "ace/Arg_Shifter.h" #include "ace/Read_Buffer.h" -#include "orbsvcs/CosTradingC.h" -#include "orbsvcs/CosTradingReposC.h" -#include "orbsvcs/CosTradingDynamicC.h" +#include "orbsvcs/orbsvcs/CosTradingC.h" +#include "orbsvcs/orbsvcs/CosTradingReposC.h" +#include "orbsvcs/orbsvcs/CosTradingDynamicC.h" #include "ttest_export.h" class TAO_TTest_Export TT_Info diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc index be9a73bffe7..45c782c3665 100644 --- a/TAO/orbsvcs/tests/Trading/Trading.mpc +++ b/TAO/orbsvcs/tests/Trading/Trading.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, dynamicany, portableserver { +project(*Test Lib): orbsvcslib, trading, naming, svc_utils, iortable, dynamicany, portableserver { sharedname = TTest idlflags += -I..\..\.. -I..\..\..\orbsvcs -Sc -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h dynamicflags = TAO_TTEST_BUILD_DLL @@ -23,7 +23,7 @@ project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, dynam } } -project(*export test): namingexe, trading_serv, dynamicany, portableserver { +project(*export test): namingexe, trading, dynamicany { after += Trading_Test_Lib libs += TTest @@ -35,7 +35,7 @@ project(*export test): namingexe, trading_serv, dynamicany, portableserver { } } -project(*import test): namingexe, trading_serv, dynamicany, portableserver { +project(*import test): namingexe, trading, dynamicany { after += Trading_Test_Lib libs += TTest @@ -47,7 +47,7 @@ project(*import test): namingexe, trading_serv, dynamicany, portableserver { } } -project(*colocated test): namingexe, trading_serv, dynamicany { +project(*colocated test): namingexe, trading, dynamicany { after += Trading_Test_Lib libs += TTest diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index aa780f7e187..cf25819a70a 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -6,8 +6,8 @@ #include "Offer_Exporter.h" #include "Offer_Importer.h" #include "Service_Type_Exporter.h" -#include "orbsvcs/Trader/Trader.h" -#include "orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/orbsvcs/Trader/Trader.h" +#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" ACE_RCSID (Trading, colocated_test, diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index 23fc4c88e83..582c340445e 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -5,8 +5,8 @@ #include "Offer_Importer.h" #include "Service_Type_Exporter.h" #include "ace/Auto_Ptr.h" -#include "orbsvcs/Trader/Trader.h" -#include "orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/orbsvcs/Trader/Trader.h" +#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" ACE_RCSID (Trading, export_test, diff --git a/TAO/orbsvcs/tests/ior_corbaname/README b/TAO/orbsvcs/tests/ior_corbaname/README index 75035230361..79ae355c477 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/README +++ b/TAO/orbsvcs/tests/ior_corbaname/README @@ -20,7 +20,7 @@ To test manually: CORBANAME style URL is used and the protocol used to contact the naming context is <iiop> implicitly. - b) ./client corbaname::iiop:doc.ece.uci.edu:12345 + b) ./client corbaname:iiop:doc.ece.uci.edu:12345 CORBANAME style URL is used and the protocol used to contact the naming context is <iiop>. diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc index 93e27debf15..a79ed9647e8 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*server): namingexe, portableserver { +project(*server): namingexe, naming { Source_Files { status_i.cpp server.cpp } } -project(*client): namingexe, portableserver { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h index 96fbbdd52d9..04dfc884fbb 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h @@ -24,7 +24,7 @@ #define IOR_CORBANAME_CLIENT_I_H #include "corbanameC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" class IOR_corbaname_Client_i { diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp index 4582f0445a0..1da3867a5da 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp @@ -1,7 +1,7 @@ // $Id$ #include "status_i.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" int main (int argc, char* argv[]) { diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp index f4f3d3311c2..ceb937af83f 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp +++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp @@ -22,20 +22,16 @@ // // ============================================================================ -#include "tao/ORB.h" -#include "tao/Object.h" -#include "tao/SystemException.h" - #include "ace/Service_Config.h" #include "ace/Log_Msg.h" #include "ace/CORBA_macros.h" +#include "tao/ORB.h" -ACE_RCSID (tests_svc_loader, - tests_svc_loader, +ACE_RCSID (tests_svc_loader, + tests_svc_loader, "$Id$") - int main (int argc, char *argv []) { |