diff options
Diffstat (limited to 'TAO/orbsvcs/FTRT_Event_Service')
9 files changed, 42 insertions, 51 deletions
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: |