diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
403 files changed, 864 insertions, 827 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 84b7370f322..1c9f650662a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -27,20 +27,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/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 a038547eefc..efcb350a92b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -16,8 +16,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/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 0d2a88a1430..695611bf0c5 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp @@ -3,12 +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$") +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/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index a9299738907..d67ae0bb3ce 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -12,8 +12,6 @@ project (CosEvent) : ec_typed_events, orbsvcslib, messaging, core, naming { dynamicflags = TAO_EVENT_BUILD_DLL TAO_NOTIFY_BUILD_DLL tagchecks += CosEvent - // Add this include path for precompiled headers - includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { CosEventComm.idl 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 0df20092960..a56cbbed72f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -15,13 +15,13 @@ #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" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index 3757c04a6f6..07293872b3f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -22,7 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEvent/event_export.h" +#include "orbsvcs/orbsvcs/CosEvent/event_export.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushSupplier; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index 87fff75616e..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" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index 1efbdfb9695..b121b22e54d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosEventCommC.h" +#include "orbsvcs/orbsvcs/CosEventCommC.h" #include "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index 138e22d052f..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_export.h" +#include "orbsvcs/orbsvcs/CosEvent/event_export.h" #include "CEC_ProxyPushSupplier.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index 17f890e1bf1..72f48f342d8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "CEC_Defaults.h" #include "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index 1e6e01dc679..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" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index 9c5e6aae45a..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" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 30e6d89e8f1..415ae07b47e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -15,13 +15,13 @@ #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 "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "event_export.h" class TAO_CEC_EventChannel; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index e2e399a2aa4..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 diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index fbe592a3bc4..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 "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; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index eefaaa6a478..be5387963ad 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -4,8 +4,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" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index 48357020537..d87dd7977dd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -16,10 +16,10 @@ #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_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h index 9668fb7418a..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_export.h" +#include "orbsvcs/orbsvcs/CosEvent/event_export.h" /** * @class TAO_CEC_Pulling_Strategy diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index 8570cfd141e..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" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h index 5698aa484ef..cf38a4aa8b9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -21,7 +21,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" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index 89c1c38b0ab..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" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index 1c40b303546..1335ad5b02e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -4,13 +4,15 @@ #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" #endif /* __ACE_INLINE__ */ -ACE_RCSID(CosEvent, CEC_SupplierAdmin, "$Id$") +ACE_RCSID (CosEvent, + CEC_SupplierAdmin, + "$Id$") TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec) : event_channel_ (ec), diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index e78cd342550..2fdab582804 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -19,13 +19,13 @@ #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" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index aeea63ca208..b65cfc52350 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -28,7 +28,7 @@ #include "tao/Objref_VarOut_T.h" -#include "orbsvcs/CosEvent/event_export.h" +#include "orbsvcs/orbsvcs/CosEvent/event_export.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushConsumer; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index aaa087d19a9..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" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index 64bcbbb9c6b..6db51475183 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -25,7 +25,7 @@ #include "CEC_Defaults.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" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index 4ee4b165b65..3ae216f6a4b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -16,13 +16,13 @@ #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 "orbsvcs/orbsvcs/ESF/ESF_Worker.h" class TAO_CEC_TypedEvent; class TAO_CEC_TypedEventChannel; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h index 9d55ac7dd1c..7f0d3002bc8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h @@ -19,13 +19,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_TypedProxyPushConsumer.h" diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc index 16acbe0c6c9..6a3c0524ec4 100644 --- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc @@ -6,8 +6,6 @@ project : orbsvcslib, core, naming, iormanip, portablegroup, messaging, ami { idlflags += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h dynamicflags = TAO_LOADBALANCING_BUILD_DLL tagchecks += CosLoadBalancing - // Add this include path for precompiled headers - includes += $(TAO_ROOT)/orbsvcs/orbsvcs avoids += minimum_corba IDL_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc index 20b2e2d86a0..86c088dc574 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc @@ -6,8 +6,6 @@ project(CosNaming) : orbsvcslib, core, messaging, svc_utils, iortable { idlflags += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h dynamicflags = TAO_NAMING_BUILD_DLL tagchecks += Naming - // Add this include path for precompiled headers - includes += $(TAO_ROOT)/orbsvcs/orbsvcs libs += TAO_Messaging after += Messaging diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index 93587db64c6..58a6bc0b99c 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -13,8 +13,6 @@ project(CosNotification) : orbsvcslib, core, svc_utils, etcl, dynamicany, portab dynamicflags = TAO_NOTIFY_BUILD_DLL TAO_EVENT_BUILD_DLL tagchecks += Notify - // Add this include path for precompiled headers - includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { CosEventComm.idl diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc index c5b7cecee87..5ff59656a4f 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc @@ -6,8 +6,6 @@ project(CosTime) : orbsvcslib, core, naming { idlflags += -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h dynamicflags = TAO_TIME_BUILD_DLL tagchecks += Time - // Add this include path for precompiled headers - includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { TimeService.idl 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_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 66c1779773b..46a9a658c0c 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" 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_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_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index d48156a0dab..205d7301521 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -1,14 +1,16 @@ // $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__) #include "ECG_UDP_Receiver.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, ECG_UDP_Receiver, "$Id$") +ACE_RCSID (Event, + ECG_UDP_Receiver, + "$Id$") // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 3e055f083e6..bc50426ae70 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 166a8ee00fc..cdbf6908e32 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -9,14 +9,16 @@ * */ -#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" #if !defined(__ACE_INLINE__) #include "ECG_UDP_Sender.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, ECG_UDP_Sender, "$Id$") +ACE_RCSID (Event, + ECG_UDP_Sender, + "$Id$") // **************************************************************** 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 d026218286d..1b846220c81 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -4,15 +4,17 @@ #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" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, EC_ConsumerAdmin, "$Id$") +ACE_RCSID (Event, + EC_ConsumerAdmin, + "$Id$") TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec) : TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushSupplier,RtecEventChannelAdmin::ProxyPushSupplier,TAO_EC_ProxyPushConsumer> (ec) 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 0a7b44ea438..a97cd55b4ce 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -1,8 +1,10 @@ // $Id$ -#include "orbsvcs/Event/EC_Gateway.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway.h" -ACE_RCSID(Event, EC_Gateway, "$Id$") +ACE_RCSID (Event, + EC_Gateway, + "$Id$") TAO_EC_Gateway::TAO_EC_Gateway (void) : handle_ (0) 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 0817bfcfa33..80835d4dde4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -1,9 +1,11 @@ // $Id$ #include "EC_Gateway_Sched.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" -ACE_RCSID(Event, EC_Gateway_sched, "$Id$") +ACE_RCSID (Event, + EC_Gateway_sched, + "$Id$") TAO_EC_Gateway_Sched::TAO_EC_Gateway_Sched (void) : TAO_EC_Gateway_IIOP () 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 7894eba09c9..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" @@ -18,7 +18,9 @@ #include "EC_Kokyu_Dispatching.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, EC_Kokyu_Dispatching, "$Id$") +ACE_RCSID (Event, + EC_Kokyu_Dispatching, + "$Id$") TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *ec, int sched_policy, int sched_scope) :allocator_ (0), 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 62d433eb367..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" @@ -15,7 +15,9 @@ #include "EC_Kokyu_Factory.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, EC_Kokyu_Factory, "$Id$") +ACE_RCSID (Event, + EC_Kokyu_Factory, + "$Id$") TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory (void) { 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 c0490f4cf17..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" @@ -14,7 +14,9 @@ #include "EC_Kokyu_Filter_Builder.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, EC_Kokyu_Filter_Builder, "$Id$") +ACE_RCSID (Event, + EC_Kokyu_Filter_Builder, + "$Id$") const char* designator (long dsgn) { 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_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_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 a470864444f..06929bcf071 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h @@ -23,7 +23,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" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h index c08e3d05705..f1885974944 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h @@ -19,7 +19,7 @@ #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 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 faf3f9e13c5..dba117af1c6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -4,14 +4,16 @@ #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" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, EC_Timeout_Filter, "$Id$") +ACE_RCSID (Event, + EC_Timeout_Filter, + "$Id$") TAO_EC_Timeout_Filter::TAO_EC_Timeout_Filter ( TAO_EC_Event_Channel_Base *event_channel, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index 40552d214d2..fdbe46377ab 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -2,13 +2,15 @@ #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" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, EC_Timeout_Generator, "$Id$") +ACE_RCSID (Event, + EC_Timeout_Generator, + "$Id$") TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator (void) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index ad193b971af..f037d3df588 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp @@ -1,8 +1,10 @@ // $Id$ -#include "orbsvcs/Event/EC_UDP_Admin.h" +#include "orbsvcs/orbsvcs/Event/EC_UDP_Admin.h" -ACE_RCSID(Event, EC_UDP_Admin, "$Id$") +ACE_RCSID (Event, + EC_UDP_Admin, + "$Id$") TAO_EC_Simple_AddrServer::TAO_EC_Simple_AddrServer (CORBA::UShort port) : port_ (port) 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 9be9bd0ef25..c6812a94ff2 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 46252134318..a7490392d68 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h +++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h @@ -22,15 +22,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event_Service_Constants.h" - -#include "orbsvcs/CosNamingC.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/Module_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp index 961f11a3074..b35af5eb52f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp @@ -1,13 +1,15 @@ // $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" -ACE_RCSID(Event, Module_Factory, "$Id$") +ACE_RCSID (Event, + Module_Factory, + "$Id$") TAO_Module_Factory::~TAO_Module_Factory (void) { diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp index f08038fa0a8..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" @@ -15,7 +15,9 @@ #include "tao/Timeprobe.h" #include "ace/OS_NS_errno.h" -ACE_RCSID(Event, RT_Task, "$Id$") +ACE_RCSID (Event, + RT_Task, + "$Id$") #if defined (ACE_ENABLE_TIMEPROBES) 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 8ea1e243627..ca449ff4800 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp @@ -2,11 +2,13 @@ #include "ace/High_Res_Timer.h" #include "tao/Timeprobe.h" -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" #include "ReactorTask.h" -ACE_RCSID(Event, ReactorTask, "$Id$") +ACE_RCSID (Event, + ReactorTask, + "$Id$") #if defined (ACE_ENABLE_TIMEPROBES) diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp index 05c3f23f6d3..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" @@ -10,7 +10,9 @@ #include "Timer_Module.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, Timer_Module, "$Id$") +ACE_RCSID (Event, + Timer_Module, + "$Id$") #include "tao/Timeprobe.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 47864187fe4..29b41b32d45 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -1,15 +1,17 @@ // $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, Event_Utilities, "$Id$") +ACE_RCSID (orbsvcs, + Event_Utilities, + "$Id$") ACE_ConsumerQOS_Factory:: ACE_ConsumerQOS_Factory (TAO_EC_Event_Initializer initializer) diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h index 9bc493d5ea3..2af9e013a46 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" 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 144c2290bbe..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/PortableGroup.idl" +# 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/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp index 0f890ec2312..a02b8ba4a14 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp @@ -5,14 +5,14 @@ #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" - ACE_RCSID (FaultTolerance, FT_ClientORBInitializer, "$Id$") + void TAO_FT_ClientORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp index 9d1b47c983c..1f86d5f03dc 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp @@ -4,11 +4,13 @@ #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" -ACE_RCSID (FaultTolerance, FT_ClientPolicyFactory, "$Id$") +ACE_RCSID (FaultTolerance, + FT_ClientPolicyFactory, + "$Id$") CORBA::Policy_ptr 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_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 f692225702f..126a9b4d1b0 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp @@ -4,11 +4,13 @@ #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" -ACE_RCSID (FaultTolerance, FT_ServerPolicyFactory, "$Id$") +ACE_RCSID (FaultTolerance, + FT_ServerPolicyFactory, + "$Id$") 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 825103312ad..4142bccf5dc 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -5,7 +5,7 @@ #include "tao/ORB_Constants.h" #include "tao/DynamicC.h" #include "tao/Typecode.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 5daddacf7de..ae09f35cd4e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc @@ -6,7 +6,6 @@ project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming { idlflags += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h dynamicflags = TAO_FTRTEVENT_BUILD_DLL tagchecks = FtRtEvent - includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { idlflags += -GC 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 d91a131a635..3a019954100 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 da132b47708..d7ef25c58eb 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 afc2072487d..d60aaeabf19 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 "FT_ProxyAdmin_Base.h" #include "IOGR_Maker.h" #include "Replication_Service.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 9fd05992ef1..a8557ae4cdb 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 8f26116b2e3..86cabee49b7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h @@ -23,8 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event/EC_SupplierAdmin.h" -//#include "event_export.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 0794962b43d..7dd9f6360cb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -9,7 +9,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 deecbb2d9a8..b1611c963f1 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" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h index 2261bf78954..e78859db173 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 3ee00248d93..e4fd4275ce7 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 ec573287867..00f77dcd87a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -9,7 +9,7 @@ #include "tao/Tagged_Components.h" #include <algorithm> #include "../Utils/resolve_init.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/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 167f74699a6..ace8f3bbed0 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 9bf56d85384..e3bbb090024 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 154b952b0be..c0f8b926cd3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Set_Update_Interceptor.h" -#include "orbsvcs/FTRTC.h" +#include "orbsvcs/orbsvcs/FTRTC.h" #include "Request_Context_Repository.h" #include "tao/IOP_IORA.h" 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.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h index 73e98ec3053..9ae5e678483 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/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index 38ddd489e3a..f4aa04e4953 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -7,7 +7,7 @@ #include "orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h" #include "orbsvcs/orbsvcs/IFRService/Options.h" #include "orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h" -#include "orbsvcs/IOR_Multicast.h" +#include "orbsvcs/orbsvcs/IOR_Multicast.h" #include "tao/IORTable/IORTable.h" #include "tao/ORB_Core.h" #include "tao/default_ports.h" 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_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.h index 39a031df043..29a45069bd3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.h @@ -22,7 +22,7 @@ # 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 9252ffaf438..a7aae0fb547 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_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 f05c271a8ad..77d5639dda6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -6,8 +6,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 33bb74dbde7..008485d6a1d 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_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/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp index 83bf95a76f0..9d6f39e6fb5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -1,11 +1,9 @@ -#include "orbsvcs/Log/BasicLogFactory_i.h" - +#include "orbsvcs/orbsvcs/Log/BasicLogFactory_i.h" ACE_RCSID (Log, BasicLogFactory_i, "$Id$") - TAO_BasicLogFactory_i::TAO_BasicLogFactory_i (void) { } diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h index ddc42d07cdb..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. diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index 672d9b51f3a..17499a8b671 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -1,13 +1,11 @@ -#include "orbsvcs/Log/BasicLog_i.h" - -#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/orbsvcs/Log/BasicLog_i.h" +#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" ACE_RCSID (Log, BasicLog_i, "$Id$") - TAO_BasicLog_i::TAO_BasicLog_i (TAO_LogMgr_i &logmgr_i, DsLogAdmin::LogMgr_ptr factory, DsLogAdmin::LogId id, diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index 79ad3c33366..b6f837e2de6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -21,13 +21,13 @@ #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_export.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp index e77340ecb05..f00ce56edef 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp @@ -1,13 +1,11 @@ -#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, "$Id$") - TAO_Event_LogConsumer::TAO_Event_LogConsumer (TAO_EventLog_i *log) : log_ (log) { diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h index ccff8564687..933bcc1c2e4 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h @@ -19,16 +19,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/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_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp index afde13e5ffe..08550f254e5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp @@ -1,13 +1,12 @@ -#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, EventLogFactory_i, "$Id$") - TAO_EventLogFactory_i::TAO_EventLogFactory_i (void) { TAO_CEC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h index 37e9f9fb39c..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) diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp index 1861943b1d0..9dfb1fa5c5a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp @@ -1,13 +1,12 @@ -#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, EventLogNotification, "$Id$") - TAO_EventLogNotification::TAO_EventLogNotification (CosEventChannelAdmin::EventChannel_ptr ec) : TAO_LogNotification (), event_channel_ (CosEventChannelAdmin::EventChannel::_duplicate (ec)) { diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h index ae29afa6b24..582b9eaa533 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h @@ -20,16 +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 "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) diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index ebabb0e3771..76e5f3afd74 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -1,13 +1,11 @@ -#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, "$Id$") - TAO_EventLog_i::TAO_EventLog_i (TAO_LogMgr_i &logmgr_i, DsLogAdmin::LogMgr_ptr factory, TAO_EventLogFactory_i *event_log_factory, diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h index 5f1329741ee..f4fb4b15618 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h @@ -20,17 +20,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/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_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp index bb649851235..ac4780e1dcc 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -1,14 +1,13 @@ #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, "$Id$") - TAO_Iterator_i::TAO_Iterator_i (TAO_LogRecordStore::LOG_RECORD_STORE &store, CORBA::ULong start, const char *constraint, diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h index d4bfe613ca9..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. diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h index 66a80494fb7..111c961ecb6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -18,13 +18,13 @@ #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_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp index 0092e5e79f5..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" @@ -8,7 +8,6 @@ ACE_RCSID (Log, LogNotification, "$Id$") - TAO_LogNotification::TAO_LogNotification (void) { // No-Op. diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h index 99f08b0e7a6..763ddace35c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h @@ -18,13 +18,13 @@ #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_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp index 84864387f6f..74038ad3d20 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp @@ -1,15 +1,14 @@ -#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, LogRecordStore, "$Id$") - TAO_LogRecordStore::TAO_LogRecordStore (CORBA::ULongLong max_size, DsLogAdmin::LogId logid, CORBA::ULong max_rec_list_len) diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h index 14fb7f5c398..c016786c432 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h @@ -19,13 +19,13 @@ #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" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h index 9d077d162e4..e365b351982 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h @@ -19,14 +19,14 @@ #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 "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/orbsvcs/DsLogAdminC.h" #include "log_export.h" class TAO_Log_Constraint_Visitor; diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index feca5d3d7ac..118957d882e 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 2cb65f58b6f..4a4866e222f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h @@ -26,8 +26,8 @@ # 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" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index f34180947a0..9a0e87618f4 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" @@ -13,7 +13,6 @@ ACE_RCSID (Log, Log_i, "$Id$") - #define QUERY_LANG_SUPPORTED_BY_LOG "TCL" TAO_Log_i::TAO_Log_i (DsLogAdmin::LogMgr_ptr factory, diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 9024075a59b..2181e2d7e72 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -20,14 +20,14 @@ #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_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index 4f21dd41ff2..7a79e1680f7 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -1,13 +1,11 @@ -#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, "$Id$") - - TAO_Notify_LogConsumer::TAO_Notify_LogConsumer (TAO_NotifyLog_i *log) : log_ (log) { diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h index d7f8a0086ee..d20ae88f2dd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h @@ -18,14 +18,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/DsNotifyLogAdminS.h" -#include "orbsvcs/Log/Log_i.h" +#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/orbsvcs/Log/Log_i.h" #include "notifylog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index 19a3c63016c..e5119599284 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -1,12 +1,11 @@ -#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, "$Id$") - TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (void) { // No-Op. diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h index a6ad82cca03..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) diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp index 60c373dc256..8c161bff3ff 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp @@ -1,13 +1,12 @@ -#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, NotifyLogNotification, "$Id$") - TAO_NotifyLogNotification::TAO_NotifyLogNotification (CosNotifyChannelAdmin::EventChannel_ptr ec) : TAO_LogNotification (), event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec)) { diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h index c9b47b2f773..0dc5d4997e5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h @@ -20,16 +20,16 @@ #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/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "notifylog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index ca1b22a7c92..20bc3f9ea0a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -1,12 +1,11 @@ -#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, "$Id$") - #define CA_FILTER "threshold > 10" #define TCL_GRAMMAR "TCL" diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h index 39d6d275cab..63fbb632bd0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h @@ -19,15 +19,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/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_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp index f61709079ea..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" @@ -11,7 +11,6 @@ ACE_RCSID (Log, PersistStore, "$Id$") - TAO_PersistStore::TAO_PersistStore (CORBA::ULongLong max_size, CORBA::ULong max_rec_list_len) : maxid_ (0), diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h index 1d84b0bb64d..883b65d21a9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h @@ -17,14 +17,14 @@ #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" #define PERSIST_LOG_DEFAULT_MAX_REC_LIST_LEN 250 diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp index 1594722db32..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/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/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/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 c98e8042cc5..1fd91e51bca 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h @@ -19,15 +19,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/RTEventLogAdminS.h" -#include "orbsvcs/Log/Log_i.h" -#include "orbsvcs/Event/EC_Event_Channel.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" 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 69e37bd5da0..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/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/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 a16c944ae9f..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/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/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/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 38ca6d987c4..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/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/Log/RTEventLogConsumer.h" +#include "orbsvcs/orbsvcs/Log/RTEventLogConsumer.h" #include "rteventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h index 52e5a30a266..cf534ad740a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h @@ -23,7 +23,7 @@ #include "ace/SString.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "naming_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index f113da90784..e500888109e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosNamingS.h" +#include "orbsvcs/orbsvcs/CosNamingS.h" #include "naming_export.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h index 601ad73e463..624b0a15949 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" class TAO_Naming_Export TAO_Naming_Loader : public TAO_Object_Loader { diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp index d39eff95551..ef52f76ecb9 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp @@ -6,7 +6,7 @@ #include "Storable_Naming_Context.h" #include "Storable_Naming_Context_Activator.h" #include "Flat_File_Persistence.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "tao/debug.h" #include "tao/default_ports.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h index ff2daa322c5..e4d0d92e235 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h @@ -21,8 +21,8 @@ #include /**/ "ace/pre.h" #include "tao/ORB.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/IOR_Multicast.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/IOR_Multicast.h" #include "Naming_Context_Interface.h" #include "nsconf.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h index 3fdb726a8f7..be0f287ba2b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "ace/Hash_Map_With_Allocator_T.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "naming_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index 46e84e728d2..03f89c49d2b 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/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp index 7f4e438926b..74b0ec9f268 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp @@ -6,9 +6,11 @@ #include "AdminProperties.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Notify, TAO_Notify_AdminProperties, "$Id$") +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/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h index 6ca5f07e18c..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; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h index c77cd8cee30..b5c7b0d5851 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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h index 459ef789a3b..bcdfce8aa9b 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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h index b252dc3e9a8..ff9acc4b10c 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) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h index fc1fd3d8d6d..b876b5246f7 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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp index e2244944d34..fd1ee695630 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp @@ -6,10 +6,12 @@ #include "PushConsumer.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Notify, TAO_Notify_PushConsumer, "$Id$") +ACE_RCSID (Notify, + TAO_Notify_PushConsumer, + "$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 98e48b52381..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" /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h index 8cdf891d598..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; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index 06f1da252e4..42440bbb117 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 8f3cfb3dcb6..6466f362956 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h @@ -22,7 +22,7 @@ #include "ace/Message_Queue.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Property.h" #include "Property_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h index e42cc2ad59f..d5c959508d3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h @@ -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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h index 9b18e9335e7..f7ff532b790 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h @@ -20,8 +20,8 @@ # 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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 842fb2ea5ae..3f9a5f08608 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -6,10 +6,12 @@ #include "ConsumerAdmin.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(RT_Notify, TAO_Notify_ConsumerAdmin, "$Id$") +ACE_RCSID (RT_Notify, + TAO_Notify_ConsumerAdmin, + "$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 0f41aaa9f68..394f43568b0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/NotifyExtS.h" +#include "orbsvcs/orbsvcs/NotifyExtS.h" #include "Admin.h" 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 23604de6421..59a953d6a46 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h @@ -20,7 +20,7 @@ # 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 diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index b47f0329c09..ea9648aea7e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -8,10 +8,12 @@ #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, TAO_CosNotify_Service, "$Id$") +ACE_RCSID (Notify, + TAO_CosNotify_Service, + "$Id$") TAO_CosNotify_Service::TAO_CosNotify_Service (void) : factory_ (0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp index 3fb6d39a784..4dc6a1be779 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp @@ -6,10 +6,12 @@ #include "Default_Factory.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_Default_Factory, "$Id$") +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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index d3056151c25..8f7f4c667bf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h index 0f5cebe080c..f51d07eaf29 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" #include "FilterFactory.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp index 4c06515781f..60fbdcbec72 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp @@ -6,10 +6,12 @@ #include "Event.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_Event, "$Id$") +ACE_RCSID (Notify, + TAO_Notify_Event, + "$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 d931edf6a9a..595e666c059 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h @@ -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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h index eaac0a7ce8c..b2fcdf3618c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "Object.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h index 3f5c1745c4f..21db8d744e0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h @@ -20,8 +20,8 @@ # 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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h index d540c62b7cb..43b31a8a7fa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" /** * @class TAO_Notify_EventType diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h index 317891d5dde..05bd7babae0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "tao/orbconf.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp index 4017259de03..a9b78c54179 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp @@ -9,9 +9,11 @@ #include "Event_Map_Entry_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_Event_Map_Entry_T, "$Id$") +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_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/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h index 1ac91e18473..7f7eb146061 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" #include "ace/Hash_Map_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h index a5123bdbd1b..9fcf4aa8c7f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h @@ -19,8 +19,8 @@ # 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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h index 4668713446d..e2c29af3b0d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h @@ -19,7 +19,7 @@ # 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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h index 2b7d34f2044..9f99375103e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "ProxySupplier.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h index d580f0533bb..6d38a1e3013 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -15,14 +15,14 @@ #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 "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterC.h" #include "notify_export.h" class TAO_Notify_Constraint_Visitor; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index f09e05f8428..e85fcf9fb81 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 bea7eb79521..c97c326b4ed 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -22,8 +22,8 @@ # 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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h index c26c63b15f1..21fdb8359bc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -13,7 +13,7 @@ #define NOTIFY_EVENTCHANNELFACTORY_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h index f13e1fc8999..216dcb9cd8c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h @@ -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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h index 345d8878c1b..710dd3e1202 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" #include "EventTypeSeq.h" class TAO_Notify_Proxy; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp index 316807f8174..466b5bd076a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp @@ -1,14 +1,16 @@ // $Id$ #include "Properties.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" #include "tao/debug.h" #if ! defined (__ACE_INLINE__) #include "Properties.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Notify, TAO_Notify_Properties, "$Id$") +ACE_RCSID (Notify, + TAO_Notify_Properties, + "$Id$") TAO_Notify_Properties::TAO_Notify_Properties (void) : factory_ (0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h index bd2e2b2bfdf..4312c83598b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h @@ -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; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property.h b/TAO/orbsvcs/orbsvcs/Notify/Property.h index a9243b79afa..f551b53c1a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property.h @@ -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 4b5a4011f9d..72554b0170d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h @@ -20,7 +20,7 @@ # 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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h index 4bf764c8693..7c9b35196fe 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" class TAO_Notify_PropertySeq; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h index 0b68a0246f5..7f1e5373018 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h @@ -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/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h index 489d5cbe077..523c572b0a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h index 8b772111525..641aab7f7b1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h @@ -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; diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp index 3cee18256d8..3850565c129 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp @@ -7,14 +7,16 @@ #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__) #include "RT_Builder.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(RT_Notify, TAO_Notify_RT_Builder, "$Id$") +ACE_RCSID (RT_Notify, + TAO_Notify_RT_Builder, + "$Id$") TAO_Notify_RT_Builder::TAO_Notify_RT_Builder (void) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp index b79f19e657a..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" @@ -11,7 +11,9 @@ #include "RT_POA_Helper.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(RT_Notify, TAO_Notify_RT_POA_Helper, "$Id$") +ACE_RCSID (RT_Notify, + TAO_Notify_RT_POA_Helper, + "$Id$") TAO_Notify_RT_POA_Helper::~TAO_Notify_RT_POA_Helper () { 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/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h index 408564117f7..356bbde952f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h @@ -19,8 +19,8 @@ # 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" /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h index 41436ff95e5..df79f19069f 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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h index cfa34eb40e2..a7066dabf1c 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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h index b5680908d22..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; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h index cd615f00b6e..06536f80d13 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h @@ -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" /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h index 7a7922b960c..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 diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h index 4d28b27bdd6..44e4bca20fa 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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h index a5d01450dc4..5defb977f07 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" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h index 98257c8c2bd..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; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h index 8d7cd70a311..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; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h index 8a377d1a06a..5763746a3c0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h @@ -19,8 +19,8 @@ # 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; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h index 64fea3a6bd4..8494f431b98 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h @@ -21,7 +21,7 @@ #include "Peer.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" class TAO_Notify_ProxyConsumer; /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp index 4d8b242a3ca..5df0e4487eb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -6,9 +6,11 @@ #include "SupplierAdmin.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(RT_Notify, TAO_Notify_SupplierAdmin, "$Id$") +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 0b58745597c..c9ae1a3ff5d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/NotifyExtS.h" +#include "orbsvcs/orbsvcs/NotifyExtS.h" #include "Admin.h" 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 281efdaa45a..16efa83de3e 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> diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h index 09df905cf90..0306516228c 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" 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 810f444574a..a4ed36858b7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -13,7 +13,7 @@ #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/orbsvcs/PortableGroup/PG_Utils.h> 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 61d201f69d2..6e4b41019aa 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 d9f49f30c6b..d7df1dca430 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.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index e07dd41754e..3a95a39877f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -514,14 +514,20 @@ TAO_PG_ObjectGroupManager::get_object_group_ref_from_id ( this->lock_, PortableGroup::ObjectGroup::_nil ()); - if (this->object_group_map_.find (group_id, group_entry) != 0) - ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), - PortableGroup::ObjectGroup::_nil ()); + if (this->object_group_map_.find (ACE_U64_TO_U32 (group_id), + group_entry) + != 0) + { + ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), + PortableGroup::ObjectGroup::_nil ()); + } } if (group_entry == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), - PortableGroup::ObjectGroup::_nil ()); + { + ACE_THROW_RETURN (CORBA::INTERNAL (), + PortableGroup::ObjectGroup::_nil ()); + } return PortableGroup::ObjectGroup::_duplicate (group_entry->object_group.in ()); 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 f33a0e344cd..4fc25b4d1ab 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 013336c057d..737209c50f5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -9,8 +9,8 @@ #include <ace/Vector_T.h> #include <tao/debug.h> #include <tao/PortableServer/ORB_Manager.h> -#include <orbsvcs/PortableGroup/PG_Operators.h> // Borrow operator == on CosNaming::Name -#include <orbsvcs/PortableGroup/PG_Utils.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Operators.h> // Borrow operator == on CosNaming::Name +#include <orbsvcs/orbsvcs/PortableGroup/PG_Utils.h> #define TODO int todo; //#define TODO diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index 51ec24ae9b1..56c928ccf91 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -37,7 +37,7 @@ namespace TAO ///////////////////////////////// // Includes needed by this header -#include <orbsvcs/PortableGroupC.h> +#include <orbsvcs/orbsvcs/PortableGroupC.h> #include <tao/PortableServer/PortableServer.h> #include <ace/Hash_Map_Manager_T.h> #include "PG_Location_Hash.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp index febbee25e61..1411062912e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp @@ -68,7 +68,7 @@ TAO::PG_Object_Group_Manipulator::create_object_group ( // Create a reference for the ObjectGroup CORBA::Object_var object_group = - this->poa_->create_reference_with_id (group_id, + this->poa_->create_reference_with_id (ACE_U64_TO_U32 (group_id), type_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); @@ -90,7 +90,9 @@ TAO::PG_Object_Group_Manipulator::create_object_group ( } void -TAO::PG_Object_Group_Manipulator::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) +TAO::PG_Object_Group_Manipulator::init (CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa + ACE_ENV_ARG_DECL) { ACE_ASSERT (CORBA::is_nil (this->orb_.in ()) && !CORBA::is_nil (orb)); this->orb_ = CORBA::ORB::_duplicate (orb); 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 aa3e765a21f..d069f4a7e56 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 ab5a4e56242..10f9475fde2 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h @@ -12,8 +12,8 @@ //============================================================================= #ifndef TAO_PG_PROPERTIES_ENCODER_H #define TAO_PG_PROPERTIES_ENCODER_H -#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 5308926aa7e..1832bc50fec 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h @@ -18,10 +18,11 @@ //============================================================================= #ifndef TAO_PG_PROPERTY_SET #define TAO_PG_PROPERTY_SET -#include "portablegroup_export.h" -#include <orbsvcs/PortableGroupS.h> #include /**/ "ace/pre.h" -#include <orbsvcs/CosNamingC.h> + +#include "portablegroup_export.h" +#include <orbsvcs/orbsvcs/PortableGroupS.h> +#include <orbsvcs/orbsvcs/CosNamingC.h> #include <ace/Hash_Map_Manager.h> #include <ace/SString.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 c204b7e7a23..e06cb37338a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h @@ -13,7 +13,8 @@ #ifndef TAO_PORTABLEGROUP_UTILS_H #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/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_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index 58fd1774e9d..193c860653b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -11,10 +11,12 @@ #include "tao/debug.h" #include "tao/target_specification.h" -#include "orbsvcs/miopC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/miopC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" -ACE_RCSID(tao, UIPMC_Profile, "$Id$") +ACE_RCSID (PortableGroup, + UIPMC_Profile, + "$Id$") #if !defined (__ACE_INLINE__) # include "UIPMC_Profile.i" 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 9c41f65d18b..944367edb2b 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 5885ce6d841..a90e6e60509 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/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc index 81866c6afd4..e1b45cba4e8 100644 --- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc @@ -6,7 +6,6 @@ project(RTCORBAEvent) : orbsvcslib, core, rtevent, naming, svc_utils, iortable, idlflags += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=naming_export.h dynamicflags = TAO_RTCORBAEVENT_BUILD_DLL tagchecks += RTCORBAEvent - includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { } 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 89ef82a8023..e13f8ba70e9 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc @@ -7,7 +7,6 @@ project(RTEvent) : orbsvcslib, core, svc_utils, messaging, portableserver { dynamicflags = TAO_RTEVENT_BUILD_DLL tagchecks += RTEvent // Add this include path for precompiled headers - includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { RtecDefaultEventData.idl diff --git a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc index 6f77d8d9817..9a3f8bace39 100644 --- a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc @@ -5,7 +5,6 @@ project(RTKokyuEvent) : orbsvcslib, core, rtevent, rtsched, naming, svc_utils, p sharedname = TAO_RTKokyuEvent dynamicflags = TAO_RTKOKYUEVENT_BUILD_DLL tagchecks += RTKokyuEvent - includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc index 53637b046e2..c26cd0a708b 100644 --- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc @@ -5,8 +5,6 @@ project(RTOLDEvent) : orbsvcslib, core, rtevent, rtsched, naming, svc_utils, por sharedname = TAO_RTOLDEvent dynamicflags = TAO_RTOLDEVENT_BUILD_DLL tagchecks += RTOLDEvent - // Add this include path for precompiled headers - includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc index 27e3a5d0f27..20115b618b3 100644 --- a/TAO/orbsvcs/orbsvcs/RTSched.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc @@ -6,8 +6,6 @@ project(RTSched) : orbsvcslib, core, naming, svc_utils, portableserver { idlflags += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h dynamicflags = TAO_RTSCHED_BUILD_DLL tagchecks += Sched - // Add this include path for precompiled headers - includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { RtecScheduler.idl diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc index 457a14b484a..f64fb728058 100644 --- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc @@ -5,7 +5,6 @@ project(RTSchedEvent) : orbsvcslib, core, rtevent, rtsched, naming, svc_utils, p sharedname = TAO_RTSchedEvent dynamicflags = TAO_RTSCHEDEVENT_BUILD_DLL tagchecks += RTSchedEvent - includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc index 7a99a65fc09..19b32966954 100644 --- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc +++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc @@ -6,7 +6,6 @@ project(RT_Notification) : orbsvcslib, core, svc_utils, dynamicany, portableserv 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 - includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index b5fac3b2054..e9294e59c15 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -1,14 +1,16 @@ // $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" #endif /* __ACE_INLINE__ */ -ACE_RCSID(orbsvcs, Runtime_Scheduler, "$Id$") +ACE_RCSID (orbsvcs, + Runtime_Scheduler, + "$Id$") // Constructor. Initialize the data from the POD_RT_Info array. diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h index b2d5ed34061..87ca3f44cb0 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 { 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/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp index c54b3b02ff4..30b55097419 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 c093698b2aa..63faf495740 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 0c636478e59..731c22ef249 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 7ac64f24bc2..8e33d7f6661 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/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp index 9b8dd1d68af..bc42c024c84 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp @@ -23,7 +23,9 @@ #include "Strategy_Scheduler.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Sched, Strategy_Scheduler, "$Id$") +ACE_RCSID (Sched, + Strategy_Scheduler, + "$Id$") ////////////////////////////////////////////// // Helper function type definition for sort // 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 08b2fcb20c8..3260b6b53bd 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; diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp index 047c3920210..5ae71bb106e 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp @@ -2,11 +2,13 @@ #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, Scheduler_Utilities, "$Id$") +ACE_RCSID (orbsvcs, + Scheduler_Utilities, + "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h index beda9ed5551..546c517114b 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 { diff --git a/TAO/orbsvcs/orbsvcs/Security.idl b/TAO/orbsvcs/orbsvcs/Security.idl index 6008412f861..1473c95af23 100644 --- a/TAO/orbsvcs/orbsvcs/Security.idl +++ b/TAO/orbsvcs/orbsvcs/Security.idl @@ -6,10 +6,8 @@ #ifndef _SECURITY_IDL_ #define _SECURITY_IDL_ -#include <tao/Services.pidl> #include <tao/TimeBase.pidl> #include <orb.idl> -#include <tao/OctetSeq.pidl> #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h index 2720bdc0634..64edd020121 100644 --- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/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/InvocationCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h index 70a6c5d45de..cc871c40a40 100644 --- a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.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/MechanismPolicy.h b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h index 1f452e62398..b7e7549e266 100644 --- a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.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/PrincipalAuthenticator.h b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h index 706e2d9276b..e8cb8b03dae 100644 --- a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h +++ b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/SecurityReplaceableC.h" +#include "orbsvcs/orbsvcs/SecurityReplaceableC.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h index 74d0f51f932..30fbe55eb1c 100644 --- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/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/SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h index c8096e3866a..720caa7c68a 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.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/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index 47c8a2c93d0..ffd37e4e84b 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 9804fe73606..01fc12d4061 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" /** * @class TAO_Security_Current_Impl diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 4ec68728480..4fde1773bdf 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -6,7 +6,7 @@ ACE_RCSID (Security, Security_PolicyFactory, "$Id$") -#include "orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/orbsvcs/SecurityLevel2C.h" #include "QOPPolicy.h" #include "EstablishTrustPolicy.h" diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl index 8dbf1e7de7f..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 <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 6e3afcecb33..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 <SecurityLevel1.idl> +#include <orbsvcs/orbsvcs/SecurityLevel1.idl> #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl index ef94e39a313..f8b157cc92a 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 <SecurityLevel2.idl> +#include <orbsvcs/orbsvcs/SecurityLevel2.idl> #include <tao/IOP.pidl> #pragma prefix "omg.org" 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 9b4d444b128..4a5da1e566d 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h @@ -19,9 +19,9 @@ #include /**/ "ace/pre.h" #include "ace/Reactor.h" -#include "orbsvcs/Naming/Naming_Utils.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" 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 b0ee99afdbb..8525b8d0d87 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #if !defined (__ACE_INLINE__) -# include "orbsvcs/Time_Utilities.i" +# include "orbsvcs/orbsvcs/Time_Utilities.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(orbsvcs, Time_Utilities, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h index 86759d4ae66..e49836bd728 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 diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index 71cb7398e55..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; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h index f144238a869..1d4b312fd84 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_export.h" +#include "orbsvcs/orbsvcs/Trader/trading_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h index 24134bc57bd..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_export.h" +#include "orbsvcs/orbsvcs/Trader/Interpreter_Utils.h" +#include "orbsvcs/orbsvcs/Trader/trading_export.h" #include "ace/Containers.h" class TAO_DynSequence_i; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h index ed3a4589d16..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_export.h" +#include "orbsvcs/orbsvcs/Trader/trading_export.h" class TAO_Constraint_Evaluator; class TAO_Constraint_Validator; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h index a8f71973a35..e8127f3b976 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h @@ -21,7 +21,7 @@ #include "tao/Typecode.h" #include "tao/CORBA_String.h" -#include "orbsvcs/Trader/trading_export.h" +#include "orbsvcs/orbsvcs/Trader/trading_export.h" // = Classes to deal with the ACE_Hash_Map_Manager. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index 1d081b73d0f..c5961a6b146 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_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) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h index cb27e1c038f..ff646edb63f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h @@ -17,7 +17,7 @@ #include "Constraint_Visitors.h" #include "Trader.h" #include "Trader_Utils.h" -#include "orbsvcs/CosTradingC.h" +#include "orbsvcs/orbsvcs/CosTradingC.h" class TAO_Trading_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator { diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index ff59d355062..fb86bce35f1 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -24,9 +24,9 @@ # 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_Export TAO_Trading_Loader : public TAO_Object_Loader { |