diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-03-14 06:14:35 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-03-14 06:14:35 +0000 |
| commit | 360eb9cc38ab03b6b4a24136243be44e90212f7e (patch) | |
| tree | 8cf2448690ccc7640fcee867fa59ed06ae1f52a8 | |
| parent | 4098205ba0310d7d2f7ae1e1cd108eceafae34d1 (diff) | |
| download | ATCD-360eb9cc38ab03b6b4a24136243be44e90212f7e.tar.gz | |
ChangeLogTag: Tue Mar 14 06:02:15 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
1063 files changed, 2664 insertions, 2653 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 97995484642..8047b4ec181 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Tue Mar 14 06:02:15 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/orbsvcs/...*.cpp: + * orbsvcs/orbsvcs/...*.h: + * orbsvcs/orbsvcs/...*.i: + * orbsvcs/orbsvcs/...*.inl: + + Add "orbsvcs/..." prefix to #includes of *.h, *.i, *.inl, and + template *.cpp files found in ${TAO_ROOT}/orbsvcs/orbsvcs. + + Mon Mar 13 19:51:12 UTC 2006 Johnny Willemsen <jwilemsen@remedy.nl> * tests/Any/Recursive/client.cpp: diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 5af70a4c2aa..2b362905c3b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -14,10 +14,10 @@ // // ============================================================================ -#include "AVStreams_i.h" -#include "sfp.h" -#include "MCast.h" -#include "RTCP.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/sfp.h" +#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/AV/RTCP.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -25,7 +25,7 @@ #include "ace/OS_NS_arpa_inet.h" #if !defined (__ACE_INLINE__) -#include "AVStreams_i.i" +#include "orbsvcs/AV/AVStreams_i.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (AV, diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 29699f8e8d5..8e23294c9bc 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -15,7 +15,7 @@ #define AVSTREAMS_I_H #include /**/ "ace/pre.h" -#include "AV_Core.h" +#include "orbsvcs/AV/AV_Core.h" #include "orbsvcs/AV/AV_export.h" #include "orbsvcs/CosPropertyS.h" @@ -1523,14 +1523,14 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#include "Transport.h" +#include "orbsvcs/AV/Transport.h" #if defined (__ACE_INLINE__) #include "tao/debug.h" -#include "AVStreams_i.i" +#include "orbsvcs/AV/AVStreams_i.i" #endif /* __ACE_INLINE__ */ -#include "Flows_T.h" +#include "orbsvcs/AV/Flows_T.h" #include /**/ "ace/post.h" #endif /* AVSTREAMS_I_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index e2eaa8cbb1d..4d15bdd853a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -14,7 +14,7 @@ // // ============================================================================ -#include "Endpoint_Strategy.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" #include "tao/debug.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h index ac3e46a7031..2cc9158853b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h @@ -15,7 +15,7 @@ #define TAO_AV_ENDPOINT_STRATEGY_H #include /**/ "ace/pre.h" -#include "AVStreams_i.h" +#include "orbsvcs/AV/AVStreams_i.h" #include "ace/os_include/os_netdb.h" // This is to remove "inherits via dominance" warnings from MSVC. @@ -180,7 +180,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL // Include the templates here. -#include "Endpoint_Strategy_T.h" +#include "orbsvcs/AV/Endpoint_Strategy_T.h" #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index 2eb84552879..b52287ef621 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -3,7 +3,7 @@ #ifndef TAO_AV_ENDPOINT_STRATEGY_T_CPP #define TAO_AV_ENDPOINT_STRATEGY_T_CPP -#include "Endpoint_Strategy_T.h" +#include "orbsvcs/AV/Endpoint_Strategy_T.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h index e6b5dcebcd0..45210da5406 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -15,7 +15,7 @@ #define TAO_AV_ENDPOINT_STRATEGY_T_H #include /**/ "ace/pre.h" -#include "Endpoint_Strategy.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -282,7 +282,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Endpoint_Strategy_T.cpp" +#include "orbsvcs/AV/Endpoint_Strategy_T.cpp" #endif /*ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp index f7d714c3b52..e7cca074af3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Fill_ACE_QoS.h" +#include "orbsvcs/AV/Fill_ACE_QoS.h" #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index 4cda527280e..496288ac71e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -4,15 +4,15 @@ // TAO_FlowSpec_Entry //------------------------------------------------------------ -#include "FlowSpec_Entry.h" -#include "Protocol_Factory.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/Protocol_Factory.h" #include "tao/debug.h" #include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) -#include "FlowSpec_Entry.i" +#include "orbsvcs/AV/FlowSpec_Entry.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h index 9dc7bc5b7ed..61ed7f1b03d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/AV/AV_export.h" -#include "AV_Core.h" +#include "orbsvcs/AV/AV_Core.h" #include "ace/Addr.h" #include "ace/Containers.h" #include "ace/SString.h" @@ -350,10 +350,10 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#include "Transport.h" +#include "orbsvcs/AV/Transport.h" #if defined (__ACE_INLINE__) -#include "FlowSpec_Entry.i" +#include "orbsvcs/AV/FlowSpec_Entry.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp index bfc0e147f35..c2e6683d223 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp @@ -3,7 +3,7 @@ #ifndef TAO_AV_FLOWS_T_CPP #define TAO_AV_FLOWS_T_CPP -#include "Flows_T.h" +#include "orbsvcs/AV/Flows_T.h" #include "tao/debug.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h index f1381e07a50..d0810ab65e1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h @@ -15,7 +15,7 @@ #define TAO_AV_FLOWS_T_H #include /**/ "ace/pre.h" -#include "AVStreams_i.h" +#include "orbsvcs/AV/AVStreams_i.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -119,7 +119,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Flows_T.cpp" +#include "orbsvcs/AV/Flows_T.cpp" #endif /*ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp index 2de91dd1be5..5ccb9148c4f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "MCast.h" -#include "AVStreams_i.h" +#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/AV/AVStreams_i.h" #include "tao/debug.h" #if !defined (__ACE_INLINE__) -#include "MCast.i" +#include "orbsvcs/AV/MCast.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h index 1cbc12ce33c..fde288896ed 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.h +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h @@ -15,8 +15,8 @@ #define TAO_AV_MCAST_H #include /**/ "ace/pre.h" -#include "FlowSpec_Entry.h" -#include "Protocol_Factory.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/Protocol_Factory.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram_Mcast.h" @@ -110,7 +110,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "MCast.i" +#include "orbsvcs/AV/MCast.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp index 04bb9086548..0fa94820c07 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "FlowSpec_Entry.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" #include "tao/debug.h" -#include "Policy.h" +#include "orbsvcs/AV/Policy.h" #if !defined(__ACE_INLINE__) -#include "Policy.i" +#include "orbsvcs/AV/Policy.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h index 837d6a0cf91..8380ed2a51f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h @@ -168,7 +168,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "Policy.i" +#include "orbsvcs/AV/Policy.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp index 26a7fa37ce9..55f5767c9ca 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Protocol_Factory.h" +#include "orbsvcs/AV/Protocol_Factory.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h index c08edb33d47..f18774d3006 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h @@ -15,8 +15,8 @@ #define TAO_AV_PROTOCOL_FACTORY_T_H #include /**/ "ace/pre.h" -#include "FlowSpec_Entry.h" -#include "Policy.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/Policy.h" #include "ace/Service_Object.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index 534cc8d1ea3..19aba484619 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "QoS_UDP.h" +#include "orbsvcs/AV/QoS_UDP.h" #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) -#include "UDP.h" +#include "orbsvcs/AV/UDP.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/MCast.h" #include "orbsvcs/AV/Fill_ACE_QoS.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h index a8175a4663d..7100217f263 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h @@ -297,7 +297,7 @@ ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_QoS_Factory) #if defined(__ACE_INLINE__) -#include "QoS_UDP.i" +#include "orbsvcs/AV/QoS_UDP.i" #endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index cdfb1eb1715..e0466db3a3c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -33,14 +33,14 @@ */ // $Id$ -#include "ntp-time.h" -#include "RTCP.h" -#include "media_timer.h" +#include "orbsvcs/AV/ntp-time.h" +#include "orbsvcs/AV/RTCP.h" +#include "orbsvcs/AV/media_timer.h" #include "tao/debug.h" -#include "global.h" -#include "md5.h" +#include "orbsvcs/AV/global.h" +#include "orbsvcs/AV/md5.h" -#include "RTCP_Packet.h" +#include "orbsvcs/AV/RTCP_Packet.h" #include "ace/OS_NS_time.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h index 931de992db6..58688376837 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h @@ -49,7 +49,7 @@ #define TAO_AV_RTCP_H #include /**/ "ace/pre.h" -#include "RTCP_Channel.h" +#include "orbsvcs/AV/RTCP_Channel.h" // FUZZ: disable check_for_math_include diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp index 0282f7b9abb..7011dab5371 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "RTCP_Channel.h" -#include "RTP.h" +#include "orbsvcs/AV/RTCP_Channel.h" +#include "orbsvcs/AV/RTP.h" #include "tao/debug.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h index 88e2b4c2feb..a9d717a33b0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h @@ -5,8 +5,8 @@ #include /**/ "ace/pre.h" -#include "RTP.h" -#include "RTCP_Packet.h" +#include "orbsvcs/AV/RTP.h" +#include "orbsvcs/AV/RTCP_Packet.h" #include "ace/Message_Block.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp index f13410c8394..60c82eed689 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "RTCP_Packet.h" -#include "RTP.h" +#include "orbsvcs/AV/RTCP_Packet.h" +#include "orbsvcs/AV/RTP.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp index e12f49d0811..af251192955 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -34,8 +34,8 @@ // $Id$ -#include "RTP.h" -#include "RTCP.h" +#include "orbsvcs/AV/RTP.h" +#include "orbsvcs/AV/RTCP.h" #include "tao/debug.h" #include "ace/OS_NS_arpa_inet.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h index e4ca31ad127..8cc883386a4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h @@ -137,9 +137,9 @@ #define MAXHDR 24 -#include "Policy.h" -#include "FlowSpec_Entry.h" -#include "MCast.h" +#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/MCast.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp index f8fc425baa1..1197d709257 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "SCTP_SEQ.h" +#include "orbsvcs/AV/SCTP_SEQ.h" #if defined (ACE_HAS_SCTP) -#include "AVStreams_i.h" +#include "orbsvcs/AV/AVStreams_i.h" #include "ace/Multihomed_INET_Addr.h" #include "tao/debug.h" #include "ace/Arg_Shifter.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h index a759762d0f2..4e3ec871b71 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h @@ -20,7 +20,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Service_Config.h" -#include "Protocol_Factory.h" +#include "orbsvcs/AV/Protocol_Factory.h" #include "ace/SOCK_SEQPACK_Association.h" #include "ace/SOCK_SEQPACK_Acceptor.h" #include "ace/SOCK_SEQPACK_Connector.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index d015d42791e..24eeb1f0930 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "TCP.h" -#include "AVStreams_i.h" +#include "orbsvcs/AV/TCP.h" +#include "orbsvcs/AV/AVStreams_i.h" #include "tao/debug.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h index f83d46d175b..1f51a7329be 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h @@ -15,8 +15,8 @@ #define TAO_AV_TCP_H #include /**/ "ace/pre.h" -#include "Protocol_Factory.h" -#include "FlowSpec_Entry.h" +#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" #include "ace/Service_Config.h" #include "ace/Svc_Handler.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp index 12272a5bc85..03047ef23e6 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "AVStreams_i.h" -#include "sfp.h" -#include "MCast.h" -#include "RTCP.h" -#include "RTP.h" -#include "UDP.h" -#include "TCP.h" -#include "FlowSpec_Entry.h" -#include "AV_Core.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/sfp.h" +#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/AV/RTCP.h" +#include "orbsvcs/AV/RTP.h" +#include "orbsvcs/AV/UDP.h" +#include "orbsvcs/AV/TCP.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/AV_Core.h" #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) -#include "QoS_UDP.h" +#include "orbsvcs/AV/QoS_UDP.h" #endif /* defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) */ #include "tao/debug.h" @@ -19,7 +19,7 @@ #include "ace/Dynamic_Service.h" #if !defined (__ACE_INLINE__) -#include "Transport.i" +#include "orbsvcs/AV/Transport.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h index 5c91622d65b..e494a20b9d4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.h +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h @@ -16,8 +16,8 @@ #include /**/ "ace/pre.h" -#include "FlowSpec_Entry.h" -#include "AV_Core.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/AV_Core.h" #include "orbsvcs/AV/AV_export.h" @@ -338,7 +338,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Transport.i" +#include "orbsvcs/AV/Transport.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index 0dde7040cf8..827079c3c90 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "UDP.h" -#include "AVStreams_i.h" -#include "MCast.h" +#include "orbsvcs/AV/UDP.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/MCast.h" #include "tao/debug.h" #include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) -#include "UDP.i" +#include "orbsvcs/AV/UDP.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (AV, diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h index 350c6b47931..f582af25ec7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "Protocol_Factory.h" +#include "orbsvcs/AV/Protocol_Factory.h" #include "ace/Service_Config.h" @@ -288,7 +288,7 @@ ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_Factory) #if defined(__ACE_INLINE__) -#include "UDP.i" +#include "orbsvcs/AV/UDP.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/md5c.cpp b/TAO/orbsvcs/orbsvcs/AV/md5c.cpp index ad1865f947e..aa4a99f8fb3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/md5c.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/md5c.cpp @@ -25,8 +25,8 @@ documentation and/or software. /* $Id$ */ -#include "global.h" -#include "md5.h" +#include "orbsvcs/AV/global.h" +#include "orbsvcs/AV/md5.h" /* Constants for MD5Transform routine. */ diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp index b38142c2534..1a5b9cd1e42 100644 --- a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp @@ -37,7 +37,7 @@ static const char rcsid[] = "@(#) $Header$"; */ -#include "media_timer.h" +#include "orbsvcs/AV/media_timer.h" #include "ace/Time_Value.h" #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_stdlib.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h index f740a19ab8f..11dcd720911 100644 --- a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h +++ b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h @@ -38,7 +38,7 @@ #define TAO_AV_NTP_TIME_H #include /**/ "ace/pre.h" -#include "RTCP.h" +#include "orbsvcs/AV/RTCP.h" /* * convert microseconds to fraction of second * 2^32 (i.e., the lsw of diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 9eb0e079d42..5a8e5318843 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "sfp.h" +#include "orbsvcs/AV/sfp.h" #include "tao/debug.h" #include "ace/ARGV.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index 473d7d98580..35ab492f34f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -16,10 +16,10 @@ #include "orbsvcs/AV/AV_export.h" -#include "Policy.h" -#include "MCast.h" -#include "AVStreams_i.h" -#include "UDP.h" +#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/UDP.h" #include "orbsvcs/sfpC.h" diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp index 033680044f5..3e62837cfdb 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp @@ -17,7 +17,7 @@ // // ============================================================================ -#include "CC_Lock.h" +#include "orbsvcs/Concurrency/CC_Lock.h" #include "ace/Log_Msg.h" ACE_RCSID (Concurrency, diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h index 412b0edf512..622f973a9df 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h @@ -26,7 +26,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/CosConcurrencyControlC.h" -#include "concurrency_serv_export.h" +#include "orbsvcs/Concurrency/concurrency_serv_export.h" /// This constant defines the number of lock modes. There is really no /// way to set this constant dynamically because the nuber of lock diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index 79f15d1a14d..91ef3d63be5 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -13,7 +13,7 @@ // // ============================================================================ -#include "CC_LockSet.h" +#include "orbsvcs/Concurrency/CC_LockSet.h" ACE_RCSID (Concurrency, CC_LockSet, diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h index cf2059f69ba..1d01ebeef27 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -45,7 +45,7 @@ #include "ace/Unbounded_Queue.h" #include "orbsvcs/CosConcurrencyControlS.h" -#include "concurrency_serv_export.h" +#include "orbsvcs/Concurrency/concurrency_serv_export.h" #if defined (lock_held) #undef lock_held diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp index 27010f583fa..dfe17f3913a 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp @@ -9,8 +9,8 @@ //============================================================================= -#include "CC_LockSetFactory.h" -#include "CC_LockSet.h" +#include "orbsvcs/Concurrency/CC_LockSetFactory.h" +#include "orbsvcs/Concurrency/CC_LockSet.h" ACE_RCSID(Concurrency, CC_LockSetFactory, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h index 45335cd02aa..6a02b8ed68d 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h @@ -21,7 +21,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/CosConcurrencyControlS.h" -#include "concurrency_serv_export.h" +#include "orbsvcs/Concurrency/concurrency_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp index 82bf8815a78..b12a3a41e57 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp @@ -13,7 +13,7 @@ // Jaiganesh Balasubramanian <jai@doc.ece.uci.edu> // ================================================================ -#include "Concurrency_Loader.h" +#include "orbsvcs/Concurrency/Concurrency_Loader.h" #include "ace/Dynamic_Service.h" ACE_RCSID (Concurrency, Concurrency_Loader, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp index 8f15dfcebc8..570cef2f20f 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -12,7 +12,7 @@ #include "ace/streams.h" #include "orbsvcs/CosConcurrencyControlC.h" #include "tao/debug.h" -#include "Concurrency_Utils.h" +#include "orbsvcs/Concurrency/Concurrency_Utils.h" ACE_RCSID (Concurrency, Concurrency_Utils, diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h index 69007785291..bd2b7173f37 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h @@ -23,8 +23,8 @@ #include /**/ "ace/pre.h" #include "orbsvcs/CosConcurrencyControlC.h" -#include "CC_LockSetFactory.h" -#include "concurrency_serv_export.h" +#include "orbsvcs/Concurrency/CC_LockSetFactory.h" +#include "orbsvcs/Concurrency/concurrency_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index 04eb746be4f..298c8981d9d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "CEC_ConsumerAdmin.h" -#include "CEC_ProxyPushSupplier.h" -#include "CEC_ProxyPullSupplier.h" -#include "CEC_ProxyPushConsumer.h" -#include "CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" +#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) -#include "CEC_ConsumerAdmin.i" +#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index 22fb74b6cc8..b121cb9d693 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -23,8 +23,8 @@ #include "orbsvcs/ESF/ESF_Proxy_Admin.h" -#include "CEC_ProxyPushSupplier.h" -#include "CEC_ProxyPullSupplier.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" +#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" #include "event_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -149,7 +149,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_ConsumerAdmin.i" +#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp index d9bc44ea197..5c0068aa874 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "CEC_ConsumerControl.h" +#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" ACE_RCSID (CosEvent, CEC_ConsumerControl, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index e62cd3c37b6..dfd6db30524 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "CEC_Default_Factory.h" -#include "CEC_MT_Dispatching.h" -#include "CEC_Reactive_Pulling_Strategy.h" -#include "CEC_ConsumerAdmin.h" -#include "CEC_SupplierAdmin.h" -#include "CEC_ProxyPushConsumer.h" -#include "CEC_ProxyPullConsumer.h" -#include "CEC_ProxyPushSupplier.h" -#include "CEC_ProxyPullSupplier.h" -#include "CEC_EventChannel.h" -#include "CEC_Reactive_ConsumerControl.h" -#include "CEC_Reactive_SupplierControl.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/CosEvent/CEC_MT_Dispatching.h" +#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h" +#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" +#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" +#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h" +#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h" #include "orbsvcs/ESF/ESF_Immediate_Changes.h" #include "orbsvcs/ESF/ESF_Delayed_Changes.h" @@ -28,13 +28,13 @@ #include "ace/Recursive_Thread_Mutex.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "CEC_TypedConsumerAdmin.h" -#include "CEC_TypedSupplierAdmin.h" -#include "CEC_TypedEventChannel.h" +#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" +#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ #if ! defined (__ACE_INLINE__) -#include "CEC_Default_Factory.i" +#include "orbsvcs/CosEvent/CEC_Default_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h index d964d69584b..2704a7ca92c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "CEC_Factory.h" +#include "orbsvcs/CosEvent/CEC_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CEC_Defaults.h" +#include "orbsvcs/CosEvent/CEC_Defaults.h" #include "ace/Service_Config.h" #include "ace/Time_Value.h" @@ -210,7 +210,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_Default_Factory.i" +#include "orbsvcs/CosEvent/CEC_Default_Factory.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_CEC_Default_Factory) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp index 6ede95fde93..14c6d6c21ca 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "CEC_Dispatching.h" -#include "CEC_ProxyPushSupplier.h" +#include "orbsvcs/CosEvent/CEC_Dispatching.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" ACE_RCSID(CosEvent, CEC_Dispatching, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index 98b0ae8b046..363d2600717 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "CEC_Dispatching_Task.h" +#include "orbsvcs/CosEvent/CEC_Dispatching_Task.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_errno.h" #if ! defined (__ACE_INLINE__) -#include "CEC_Dispatching_Task.i" +#include "orbsvcs/CosEvent/CEC_Dispatching_Task.i" #endif /* __ACE_INLINE__ */ #include "ace/OS_NS_errno.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index 74a4ed0fbea..fcdcb8a564a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CEC_ProxyPushSupplier.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" #include "tao/Basic_Types.h" @@ -32,7 +32,7 @@ #include "ace/Task.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "CEC_TypedEvent.h" +#include "orbsvcs/CosEvent/CEC_TypedEvent.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -157,7 +157,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_Dispatching_Task.i" +#include "orbsvcs/CosEvent/CEC_Dispatching_Task.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp index a554f477090..75813fad39b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp @@ -2,14 +2,14 @@ // // $Id$ -#include "CEC_DynamicImplementation.h" +#include "orbsvcs/CosEvent/CEC_DynamicImplementation.h" #include "tao/DynamicInterface/Request.h" #include "tao/DynamicInterface/Unknown_User_Exception.h" #include "tao/debug.h" -#include "CEC_TypedEvent.h" +#include "orbsvcs/CosEvent/CEC_TypedEvent.h" #if !defined(__ACE_INLINE__) -#include "CEC_DynamicImplementation.i" +#include "orbsvcs/CosEvent/CEC_DynamicImplementation.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h index 7045d2bea76..98c4b91c1cd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h @@ -14,8 +14,8 @@ #ifndef TAO_CEC_DYNAMICIMPLEMENTATION_H #define TAO_CEC_DYNAMICIMPLEMENTATION_H -#include "CEC_TypedProxyPushConsumer.h" -#include "CEC_TypedEventChannel.h" +#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h" +#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" #include "tao/DynamicInterface/Server_Request.h" #include "tao/DynamicInterface/Dynamic_Implementation.h" #include "tao/ORB.h" @@ -78,7 +78,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "CEC_DynamicImplementation.i" +#include "orbsvcs/CosEvent/CEC_DynamicImplementation.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_CEC_DYNAMICIMPLEMENTATION_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index 3da9d1b480b..c24469dae73 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -1,16 +1,16 @@ // $Id$ -#include "CEC_EventChannel.h" -#include "CEC_Dispatching.h" -#include "CEC_Pulling_Strategy.h" -#include "CEC_ConsumerAdmin.h" -#include "CEC_SupplierAdmin.h" -#include "CEC_ConsumerControl.h" -#include "CEC_SupplierControl.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Dispatching.h" +#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h" +#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" +#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" +#include "orbsvcs/CosEvent/CEC_SupplierControl.h" #include "ace/Dynamic_Service.h" #if ! defined (__ACE_INLINE__) -#include "CEC_EventChannel.i" +#include "orbsvcs/CosEvent/CEC_EventChannel.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(CosEvent, CEC_EventChannel, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index f9e5cbf7ddf..5cb68b63617 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -21,7 +21,7 @@ #include /**/ "ace/pre.h" -#include "CEC_Factory.h" +#include "orbsvcs/CosEvent/CEC_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,7 +29,7 @@ #include "orbsvcs/CosEventChannelAdminS.h" -#include "CEC_Defaults.h" +#include "orbsvcs/CosEvent/CEC_Defaults.h" #include "event_serv_export.h" #include "ace/Hash_Map_Manager.h" @@ -304,7 +304,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_EventChannel.i" +#include "orbsvcs/CosEvent/CEC_EventChannel.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index ebde4c274ed..aff46a59bb1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -15,7 +15,7 @@ // //=========================================================================== -#include "CEC_Event_Loader.h" +#include "orbsvcs/CosEvent/CEC_Event_Loader.h" #include "ace/Dynamic_Service.h" #include "orbsvcs/CosNamingC.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index ea8fb5ffad3..28bfe57bad7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -19,10 +19,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "CEC_TypedEventChannel.h" +#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ #include "orbsvcs/CosNamingC.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp index c8d507dda6c..e2ffe759211 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "CEC_Factory.h" +#include "orbsvcs/CosEvent/CEC_Factory.h" #include "ace/Dynamic_Service.h" ACE_RCSID(CosEvent, CEC_Factory, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp index 5afd264b557..41f29d8a59e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "CEC_MT_Dispatching.h" +#include "orbsvcs/CosEvent/CEC_MT_Dispatching.h" ACE_RCSID(CosEvent, CEC_MT_Dispatching, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h index a4ffda1504d..458110cad9a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "CEC_Dispatching.h" +#include "orbsvcs/CosEvent/CEC_Dispatching.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CEC_Dispatching_Task.h" +#include "orbsvcs/CosEvent/CEC_Dispatching_Task.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index 3194d66a76e..039ccb5f5f8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "CEC_ProxyPullConsumer.h" -#include "CEC_EventChannel.h" -#include "CEC_ConsumerAdmin.h" -#include "CEC_SupplierControl.h" -#include "CEC_ProxyPullSupplier.h" +#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_SupplierControl.h" +#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "CEC_ProxyPullConsumer.i" +#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 423911f6549..329fa1c6b9e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -138,7 +138,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_ProxyPullConsumer.i" +#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index 31d3eff1894..fb3f757e79c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "CEC_ProxyPullSupplier.h" -#include "CEC_Dispatching.h" -#include "CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" +#include "orbsvcs/CosEvent/CEC_Dispatching.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "CEC_ProxyPullSupplier.i" +#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 3a4a5f469d2..96b58e0b898 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -162,7 +162,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_ProxyPullSupplier.i" +#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index 65dd613c1c8..decf2fb4302 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "CEC_ProxyPushConsumer.h" -#include "CEC_EventChannel.h" -#include "CEC_ConsumerAdmin.h" -#include "CEC_ProxyPushSupplier.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "CEC_ProxyPushConsumer.i" +#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index 51f641a464e..e0eb29379bd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -190,7 +190,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_ProxyPushConsumer.i" +#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index ce4dde30d4d..e1fced258d9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -6,16 +6,16 @@ // question when using compilers like g++ 3.4.x. #include "tao/DynamicInterface/DII_CORBA_methods.h" -#include "CEC_ProxyPushSupplier.h" -#include "CEC_Dispatching.h" -#include "CEC_EventChannel.h" -#include "CEC_ConsumerControl.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" +#include "orbsvcs/CosEvent/CEC_Dispatching.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" #include "orbsvcs/ESF/ESF_RefCount_Guard.h" #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" #include "tao/debug.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "CEC_TypedEvent.h" -#include "CEC_TypedEventChannel.h" +#include "orbsvcs/CosEvent/CEC_TypedEvent.h" +#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" #include "tao/DynamicInterface/Request.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ @@ -23,7 +23,7 @@ #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "CEC_ProxyPushSupplier.i" +#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index b40b889d93d..1759886ad64 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -199,7 +199,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_ProxyPushSupplier.i" +#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp index be36052afe1..eeb8c998046 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "CEC_Pulling_Strategy.h" +#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h" ACE_RCSID(CosEvent, CEC_Pulling_Strategy, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index 4a6c2601e87..934fc6e4c82 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -4,17 +4,17 @@ // the Typed and Un-typed Event Channels. A check must be made in the code // to ensure the correct EC is referenced. -#include "CEC_EventChannel.h" -#include "CEC_ConsumerAdmin.h" -#include "CEC_Reactive_ConsumerControl.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "CEC_TypedEventChannel.h" -#include "CEC_TypedConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "CEC_ProxyPushSupplier.h" -#include "CEC_ProxyPullSupplier.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" +#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" #include "orbsvcs/Time_Utilities.h" @@ -27,7 +27,7 @@ #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "CEC_Reactive_ConsumerControl.i" +#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index dfe4016fd40..f1cc2e40767 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "CEC_ConsumerControl.h" +#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -205,7 +205,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_Reactive_ConsumerControl.i" +#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index 0ab2cb20668..55063132e47 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "CEC_ProxyPullConsumer.h" -#include "CEC_EventChannel.h" -#include "CEC_SupplierAdmin.h" -#include "CEC_ConsumerAdmin.h" -#include "CEC_Reactive_Pulling_Strategy.h" +#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" +#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h" #include "orbsvcs/Time_Utilities.h" @@ -17,7 +17,7 @@ #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "CEC_Reactive_Pulling_Strategy.i" +#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(CosEvent, CEC_Reactive_Pulling_Strategy, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h index 93ce73d3dae..a43c423f3a3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "CEC_Pulling_Strategy.h" +#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -143,7 +143,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_Reactive_Pulling_Strategy.i" +#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index 44160797db3..b7a49603b36 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -4,18 +4,18 @@ // the Typed and Un-typed Event Channels. A check must be made in the code // to ensure the correct EC is referenced. -#include "CEC_EventChannel.h" -#include "CEC_SupplierAdmin.h" -#include "CEC_ProxyPushConsumer.h" -#include "CEC_Reactive_SupplierControl.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" +#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "CEC_TypedEventChannel.h" -#include "CEC_TypedSupplierAdmin.h" -#include "CEC_TypedProxyPushConsumer.h" +#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" +#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "CEC_ProxyPullConsumer.h" +#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" #include "orbsvcs/Time_Utilities.h" @@ -28,7 +28,7 @@ #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "CEC_Reactive_SupplierControl.i" +#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index 4695dec0465..bd7cbe1fd94 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "CEC_SupplierControl.h" +#include "orbsvcs/CosEvent/CEC_SupplierControl.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -221,7 +221,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_Reactive_SupplierControl.i" +#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index ee9e92cf84a..e667fe96e0d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "CEC_SupplierAdmin.h" -#include "CEC_ProxyPushConsumer.h" -#include "CEC_ProxyPullConsumer.h" -#include "CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" +#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) -#include "CEC_SupplierAdmin.i" +#include "orbsvcs/CosEvent/CEC_SupplierAdmin.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index 0ad1d64c26b..13f812c75c2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -27,8 +27,8 @@ #include "orbsvcs/ESF/ESF_Proxy_Admin.h" -#include "CEC_ProxyPushConsumer.h" -#include "CEC_ProxyPullConsumer.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" +#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" #include "event_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -119,7 +119,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_SupplierAdmin.i" +#include "orbsvcs/CosEvent/CEC_SupplierAdmin.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp index 41a721d9fcf..e9b79b992cd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "CEC_SupplierControl.h" +#include "orbsvcs/CosEvent/CEC_SupplierControl.h" ACE_RCSID(CosEvent, CEC_SupplierControl, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp index 4c20d585864..69c08a7b739 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp @@ -2,12 +2,12 @@ // // $Id$ -#include "CEC_TypedConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" -#include "CEC_TypedEventChannel.h" +#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" #if ! defined (__ACE_INLINE__) -#include "CEC_TypedConsumerAdmin.i" +#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index 52ab83d7977..72925fb2c00 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h @@ -26,8 +26,8 @@ #include "orbsvcs/ESF/ESF_Proxy_Admin.h" -#include "CEC_ProxyPushSupplier.h" -#include "CEC_TypedEvent.h" +#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" +#include "orbsvcs/CosEvent/CEC_TypedEvent.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -122,7 +122,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_TypedConsumerAdmin.i" +#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp index feb1e04e569..9142e04e6bb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp @@ -2,8 +2,8 @@ // // $Id$ -#include "CEC_TypedEvent.h" +#include "orbsvcs/CosEvent/CEC_TypedEvent.h" #if ! defined (__ACE_INLINE__) -#include "CEC_TypedEvent.i" +#include "orbsvcs/CosEvent/CEC_TypedEvent.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h index ead311f77b0..3d47bb3e808 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h @@ -61,7 +61,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_TypedEvent.i" +#include "orbsvcs/CosEvent/CEC_TypedEvent.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index 75e83026e03..f2eb11a7d0d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -2,17 +2,17 @@ // // $Id$ -#include "CEC_TypedEventChannel.h" -#include "CEC_Dispatching.h" -#include "CEC_TypedConsumerAdmin.h" -#include "CEC_TypedSupplierAdmin.h" -#include "CEC_ConsumerControl.h" -#include "CEC_SupplierControl.h" +#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "orbsvcs/CosEvent/CEC_Dispatching.h" +#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" +#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" +#include "orbsvcs/CosEvent/CEC_SupplierControl.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" #if ! defined (__ACE_INLINE__) -#include "CEC_TypedEventChannel.i" +#include "orbsvcs/CosEvent/CEC_TypedEventChannel.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index e91addfd7c9..91cfe17fd94 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -24,11 +24,11 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CEC_Defaults.h" +#include "orbsvcs/CosEvent/CEC_Defaults.h" #include "orbsvcs/CosTypedEventChannelAdminS.h" -#include "CEC_Factory.h" +#include "orbsvcs/CosEvent/CEC_Factory.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/AnyTypeCode/NVList.h" @@ -381,7 +381,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_TypedEventChannel.i" +#include "orbsvcs/CosEvent/CEC_TypedEventChannel.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp index 3906e82e5f3..f745c5a942c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp @@ -2,14 +2,14 @@ // // $Id$ -#include "CEC_TypedProxyPushConsumer.h" -#include "CEC_TypedEventChannel.h" -#include "CEC_TypedConsumerAdmin.h" -#include "CEC_DynamicImplementation.h" +#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h" +#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_DynamicImplementation.h" #include "tao/debug.h" #if ! defined (__ACE_INLINE__) -#include "CEC_TypedProxyPushConsumer.i" +#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ #include "ace/Reverse_Lock_T.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index 98a8faa15cb..aa737d9ddf0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -189,7 +189,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_TypedProxyPushConsumer.i" +#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp index 6e635da8311..a156440cc16 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "CEC_TypedSupplierAdmin.h" +#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" -#include "CEC_TypedEventChannel.h" +#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" #if ! defined (__ACE_INLINE__) -#include "CEC_TypedSupplierAdmin.i" +#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h index 235023ce977..eaa3747387f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h @@ -26,7 +26,7 @@ #include "orbsvcs/ESF/ESF_Proxy_Admin.h" -#include "CEC_TypedProxyPushConsumer.h" +#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -101,7 +101,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "CEC_TypedSupplierAdmin.i" +#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp index e33aaee8cd4..0cca17fb185 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp @@ -3,10 +3,10 @@ #ifndef TAO_ESF_BUSY_LOCK_CPP #define TAO_ESF_BUSY_LOCK_CPP -#include "ESF_Busy_Lock.h" +#include "orbsvcs/ESF/ESF_Busy_Lock.h" #if ! defined (__ACE_INLINE__) -#include "ESF_Busy_Lock.i" +#include "orbsvcs/ESF/ESF_Busy_Lock.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h index 7a77ddc1d5a..06587d8df56 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h @@ -66,7 +66,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ESF_Busy_Lock.i" +#include "orbsvcs/ESF/ESF_Busy_Lock.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp index 89694084172..ea15a0e703e 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp @@ -3,8 +3,8 @@ #ifndef TAO_ESF_COPY_ON_READ_CPP #define TAO_ESF_COPY_ON_READ_CPP -#include "ESF_Copy_On_Read.h" -#include "ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Copy_On_Read.h" +#include "orbsvcs/ESF/ESF_Worker.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h index b4d60ef6bb1..34e9a528325 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h @@ -13,7 +13,7 @@ #ifndef TAO_ESF_COPY_ON_READ_H #define TAO_ESF_COPY_ON_READ_H -#include "ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp index da35f7947e6..169f5eac972 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp @@ -3,10 +3,10 @@ #ifndef TAO_ESF_COPY_ON_WRITE_CPP #define TAO_ESF_COPY_ON_WRITE_CPP -#include "ESF_Copy_On_Write.h" +#include "orbsvcs/ESF/ESF_Copy_On_Write.h" #if ! defined (__ACE_INLINE__) -#include "ESF_Copy_On_Write.i" +#include "orbsvcs/ESF/ESF_Copy_On_Write.i" #endif /* __ACE_INLINE__ */ #include "tao/Environment.h" diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h index db4313324d7..31d4bbeb7dc 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h @@ -13,7 +13,7 @@ #ifndef TAO_ESF_COPY_ON_WRITE_H #define TAO_ESF_COPY_ON_WRITE_H -#include "ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "tao/Basic_Types.h" @@ -170,7 +170,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ESF_Copy_On_Write.i" +#include "orbsvcs/ESF/ESF_Copy_On_Write.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp index d2b5cb9ac45..5398387800c 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp @@ -3,15 +3,15 @@ #ifndef TAO_ESF_DELAYED_CHANGES_CPP #define TAO_ESF_DELAYED_CHANGES_CPP -#include "ESF_Delayed_Changes.h" +#include "orbsvcs/ESF/ESF_Delayed_Changes.h" #if ! defined (__ACE_INLINE__) -#include "ESF_Delayed_Changes.i" +#include "orbsvcs/ESF/ESF_Delayed_Changes.i" #endif /* __ACE_INLINE__ */ -#include "ESF_Defaults.h" -#include "ESF_Worker.h" -#include "ESF_Delayed_Command.h" +#include "orbsvcs/ESF/ESF_Defaults.h" +#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Delayed_Command.h" #include "ace/Functor.h" diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h index 427be6dfbe8..fc0c12ae01c 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h @@ -12,13 +12,13 @@ #ifndef TAO_ESF_DELAYED_CHANGES_H #define TAO_ESF_DELAYED_CHANGES_H -#include "ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ESF_Busy_Lock.h" +#include "orbsvcs/ESF/ESF_Busy_Lock.h" #include "ace/Containers.h" @@ -146,7 +146,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ESF_Delayed_Changes.i" +#include "orbsvcs/ESF/ESF_Delayed_Changes.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp index fb3ae4b1a24..fe0a7812db0 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp @@ -3,10 +3,10 @@ #ifndef TAO_ESF_DELAYED_COMMAND_CPP #define TAO_ESF_DELAYED_COMMAND_CPP -#include "ESF_Delayed_Command.h" +#include "orbsvcs/ESF/ESF_Delayed_Command.h" #if ! defined (__ACE_INLINE__) -#include "ESF_Delayed_Command.i" +#include "orbsvcs/ESF/ESF_Delayed_Command.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h index 6cd8ad10bc7..0d344b04479 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h @@ -173,7 +173,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ESF_Delayed_Command.i" +#include "orbsvcs/ESF/ESF_Delayed_Command.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp index 74bfc1932f6..c1bbac9dad0 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp @@ -3,13 +3,13 @@ #ifndef TAO_ESF_IMMEDIATE_CHANGES_CPP #define TAO_ESF_IMMEDIATE_CHANGES_CPP -#include "ESF_Immediate_Changes.h" +#include "orbsvcs/ESF/ESF_Immediate_Changes.h" #if ! defined (__ACE_INLINE__) -#include "ESF_Immediate_Changes.i" +#include "orbsvcs/ESF/ESF_Immediate_Changes.i" #endif /* __ACE_INLINE__ */ -#include "ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h index b9dc570be95..3a8c5f97f46 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h @@ -12,7 +12,7 @@ #ifndef TAO_ESF_IMMEDIATE_CHANGES_H #define TAO_ESF_IMMEDIATE_CHANGES_H -#include "ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -55,7 +55,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ESF_Immediate_Changes.i" +#include "orbsvcs/ESF/ESF_Immediate_Changes.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp index f62dc4237b1..40afd8d452f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp @@ -3,7 +3,7 @@ #ifndef TAO_ESF_PEER_ADMIN_CPP #define TAO_ESF_PEER_ADMIN_CPP -#include "ESF_Peer_Workers.h" +#include "orbsvcs/ESF/ESF_Peer_Workers.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h index abd9d043c2f..b896753fe0e 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h @@ -13,7 +13,7 @@ #ifndef TAO_ESF_PEER_ADMIN_H #define TAO_ESF_PEER_ADMIN_H -#include "ESF_Proxy_Admin.h" +#include "orbsvcs/ESF/ESF_Proxy_Admin.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp index c9526a90326..354daec8bed 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp @@ -3,10 +3,10 @@ #ifndef TAO_ESF_PEER_WORKERS_CPP #define TAO_ESF_PEER_WORKERS_CPP -#include "ESF_Peer_Workers.h" +#include "orbsvcs/ESF/ESF_Peer_Workers.h" #if ! defined (__ACE_INLINE__) -#include "ESF_Peer_Workers.i" +#include "orbsvcs/ESF/ESF_Peer_Workers.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h index 36ba3bba4e0..d8d73d050b3 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h @@ -13,7 +13,7 @@ #ifndef TAO_ESF_PEER_WORKERS_H #define TAO_ESF_PEER_WORKERS_H -#include "ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -93,7 +93,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ESF_Peer_Workers.i" +#include "orbsvcs/ESF/ESF_Peer_Workers.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp index a8094e3afa8..8449b48d0b2 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp @@ -4,10 +4,10 @@ #define TAO_ESF_PROXY_ADMIN_CPP #if ! defined (__ACE_INLINE__) -#include "ESF_Proxy_Admin.i" +#include "orbsvcs/ESF/ESF_Proxy_Admin.i" #endif /* __ACE_INLINE__ */ -#include "ESF_Shutdown_Proxy.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h index 8071bc45b1d..529c3c043be 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h @@ -13,8 +13,8 @@ #ifndef TAO_ESF_PROXY_ADMIN_H #define TAO_ESF_PROXY_ADMIN_H -#include "ESF_Proxy_Collection.h" -#include "ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Worker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -153,7 +153,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ESF_Proxy_Admin.i" +#include "orbsvcs/ESF/ESF_Proxy_Admin.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp index 7555834bd53..1691a2dcc02 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp @@ -3,8 +3,8 @@ #ifndef TAO_ESF_PROXY_COLLECTION_CPP #define TAO_ESF_PROXY_COLLECTION_CPP -#include "ESF_Proxy_Collection.h" -#include "ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Worker.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp index ecaa112999d..ebe73ce7996 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp @@ -3,10 +3,10 @@ #ifndef TAO_ESF_PROXY_LIST_CPP #define TAO_ESF_PROXY_LIST_CPP -#include "ESF_Proxy_List.h" +#include "orbsvcs/ESF/ESF_Proxy_List.h" #if ! defined (__ACE_INLINE__) -#include "ESF_Proxy_List.i" +#include "orbsvcs/ESF/ESF_Proxy_List.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h index 83142361906..5ba72330583 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h @@ -74,7 +74,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ESF_Proxy_List.i" +#include "orbsvcs/ESF/ESF_Proxy_List.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp index 34bdc83b5d2..000b91f27d9 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp @@ -3,10 +3,10 @@ #ifndef TAO_ESF_PROXY_RB_TREE_CPP #define TAO_ESF_PROXY_RB_TREE_CPP -#include "ESF_Proxy_RB_Tree.h" +#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h" #if ! defined (__ACE_INLINE__) -#include "ESF_Proxy_RB_Tree.i" +#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h index a1b675db8a2..0539e6cc73c 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h @@ -100,7 +100,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ESF_Proxy_RB_Tree.i" +#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp index 4c326c03c5e..5e236899e02 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp @@ -3,10 +3,10 @@ #ifndef TAO_ESF_PROXY_REFCOUNT_GUARD_CPP #define TAO_ESF_PROXY_REFCOUNT_GUARD_CPP -#include "ESF_Proxy_RefCount_Guard.h" +#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" #if ! defined (__ACE_INLINE__) -#include "ESF_Proxy_RefCount_Guard.i" +#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h index 14c85f322e9..4a1c8d3eac3 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h @@ -65,7 +65,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ESF_Proxy_RefCount_Guard.i" +#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp index 432189332bb..ae87b7f97f1 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp @@ -3,10 +3,10 @@ #ifndef TAO_ESF_REFCOUNT_GUARD_CPP #define TAO_ESF_REFCOUNT_GUARD_CPP -#include "ESF_RefCount_Guard.h" +#include "orbsvcs/ESF/ESF_RefCount_Guard.h" #if ! defined (__ACE_INLINE__) -#include "ESF_RefCount_Guard.i" +#include "orbsvcs/ESF/ESF_RefCount_Guard.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(ESF, ESF_RefCount_Guard, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h index 4cb3cb9e9be..bfd4c8066ec 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h @@ -53,7 +53,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ESF_RefCount_Guard.i" +#include "orbsvcs/ESF/ESF_RefCount_Guard.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp index 2998344a44e..a0db9862e3f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp @@ -3,11 +3,11 @@ #ifndef TAO_ESF_SHUTDOWN_PROXY_CPP #define TAO_ESF_SHUTDOWN_PROXY_CPP -#include "ESF_Shutdown_Proxy.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #include "ace/CORBA_macros.h" #if ! defined (__ACE_INLINE__) -#include "ESF_Shutdown_Proxy.i" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h index 733c8ccadf4..a198f44f707 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h @@ -14,7 +14,7 @@ #ifndef TAO_ESF_SHUTDOWN_PROXY_H #define TAO_ESF_SHUTDOWN_PROXY_H -#include "ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -38,7 +38,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ESF_Shutdown_Proxy.i" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp index 9de69d5ff82..ef8c4ad0f37 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp @@ -3,7 +3,7 @@ #ifndef TAO_ESF_WORKER_CPP #define TAO_ESF_WORKER_CPP -#include "ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp index 1c853eb6929..56769b5c112 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp @@ -1,9 +1,9 @@ // -*- C++ -*- // $Id$ -#include "ETCL_Constraint.h" -#include "ETCL_Constraint_Visitor.h" -#include "ETCL_y.h" +#include "orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h" +#include "orbsvcs/ETCL/ETCL_y.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/AnyTypeCode/TypeCode.h" @@ -13,7 +13,7 @@ #include "tao/CDR.h" #if ! defined (__ACE_INLINE__) -#include "ETCL_Constraint.inl" +#include "orbsvcs/ETCL/ETCL_Constraint.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (ETCL, diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h index 96dbf1e5ffe..01d786fc54f 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h @@ -19,7 +19,7 @@ #ifndef TAO_ETCL_CONSTRAINT_H #define TAO_ETCL_CONSTRAINT_H -#include "etcl_export.h" +#include "orbsvcs/ETCL/etcl_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -425,7 +425,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ETCL_Constraint.inl" +#include "orbsvcs/ETCL/ETCL_Constraint.inl" #endif /* __ACE_INLINE__ */ #endif /* TAO_ETCL_CONSTRAINT_H */ diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h index 403de155634..0f23f7a02c0 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h @@ -14,7 +14,7 @@ #ifndef TAO_ETCL_CONSTRAINT_VISITOR_H #define TAO_ETCL_CONSTRAINT_VISITOR_H -#include "etcl_export.h" +#include "orbsvcs/ETCL/etcl_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp index 8a85f2bf3e4..2f083900155 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp @@ -1,8 +1,8 @@ // -*- C++ -*- // $Id$ -#include "ETCL_Interpreter.h" -#include "ETCL_Constraint.h" +#include "orbsvcs/ETCL/ETCL_Interpreter.h" +#include "orbsvcs/ETCL/ETCL_Constraint.h" #include "ace/Guard_T.h" #include "ace/Thread_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h index ab771b88071..81210143c38 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h @@ -16,7 +16,7 @@ #define TAO_ETCL_INTERPRETER_H #include /**/ "ace/pre.h" -#include "etcl_export.h" +#include "orbsvcs/ETCL/etcl_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp index 30281eb5e20..1d5fbb80ccb 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp @@ -466,9 +466,9 @@ TAO_END_VERSIONED_NAMESPACE_DECL // // ======================================================================== -#include "ETCL_Interpreter.h" -#include "ETCL_Constraint.h" -#include "ETCL_y.h" +#include "orbsvcs/ETCL/ETCL_Interpreter.h" +#include "orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/ETCL/ETCL_y.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp index 252bee65b58..1c07ea5d3a7 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp @@ -66,9 +66,9 @@ // // ======================================================================== -#include "ETCL_y.h" -#include "ETCL_Constraint.h" -#include "ETCL_Interpreter.h" +#include "orbsvcs/ETCL/ETCL_y.h" +#include "orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/ETCL/ETCL_Interpreter.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp index 2d6d9e4bf31..8813fee591c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ECG_Adapters.h" +#include "orbsvcs/Event/ECG_Adapters.h" ACE_RCSID (Event, ECG_Adapters, diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h index 62bd0a45004..c864aff2456 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h @@ -14,7 +14,7 @@ #include /**/ "event_serv_export.h" #include "orbsvcs/RtecUDPAdminS.h" -#include "EC_Lifetime_Utils.h" +#include "orbsvcs/Event/EC_Lifetime_Utils.h" #include "ace/Auto_Ptr.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp index e31e39e1f53..faf377fd386 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ECG_CDR_Message_Receiver.h" -#include "ECG_CDR_Message_Sender.h" +#include "orbsvcs/Event/ECG_CDR_Message_Receiver.h" +#include "orbsvcs/Event/ECG_CDR_Message_Sender.h" #include "tao/Exception.h" @@ -10,7 +10,7 @@ #include "ace/OS_NS_string.h" #if !defined(__ACE_INLINE__) -#include "ECG_CDR_Message_Receiver.i" +#include "orbsvcs/Event/ECG_CDR_Message_Receiver.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h index 2cf3bbafb3d..8159a4e2f15 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "ECG_UDP_Out_Endpoint.h" +#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -310,7 +310,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "ECG_CDR_Message_Receiver.i" +#include "orbsvcs/Event/ECG_CDR_Message_Receiver.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp index 6e0eadbfce6..be2af5fe269 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "ECG_CDR_Message_Sender.h" +#include "orbsvcs/Event/ECG_CDR_Message_Sender.h" #include "tao/CDR.h" #include "ace/SOCK_Dgram.h" #include "ace/INET_Addr.h" #include "ace/ACE.h" #if !defined(__ACE_INLINE__) -#include "ECG_CDR_Message_Sender.i" +#include "orbsvcs/Event/ECG_CDR_Message_Sender.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, ECG_CDR_Message_Sender, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h index 10e3c2569bf..bc504ef4230 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "ECG_UDP_Out_Endpoint.h" +#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -182,7 +182,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "ECG_CDR_Message_Sender.i" +#include "orbsvcs/Event/ECG_CDR_Message_Sender.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp index 813ac5f2a9d..3091fb79acf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "ECG_Complex_Address_Server.h" +#include "orbsvcs/Event/ECG_Complex_Address_Server.h" #include "ace/SString.h" #include "ace/streams.h" #if !defined(__ACE_INLINE__) -#include "ECG_Complex_Address_Server.i" +#include "orbsvcs/Event/ECG_Complex_Address_Server.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h index 306e1f74daa..bebc8583dec 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h @@ -21,7 +21,7 @@ #include "ace/INET_Addr.h" #include "ace/Null_Mutex.h" -#include "EC_Lifetime_Utils_T.h" +#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -110,7 +110,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "ECG_Complex_Address_Server.i" +#include "orbsvcs/Event/ECG_Complex_Address_Server.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp index f8d2b10e007..b5b65cc294b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ECG_ConsumerEC_Control.h" +#include "orbsvcs/Event/ECG_ConsumerEC_Control.h" ACE_RCSID(Event, ECG_ConsumerEventChannelControl, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index ac3e7cb31bd..359db71579f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -10,7 +10,7 @@ #include "ace/os_include/os_fcntl.h" #if !defined(__ACE_INLINE__) -#include "ECG_Mcast_EH.i" +#include "orbsvcs/Event/ECG_Mcast_EH.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, ECG_Mcast_EH, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index b25734ed026..9e4927a59cf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -30,9 +30,9 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include /**/ "event_serv_export.h" -#include "ECG_Adapters.h" -#include "EC_Lifetime_Utils.h" -#include "EC_Lifetime_Utils_T.h" +#include "orbsvcs/Event/ECG_Adapters.h" +#include "orbsvcs/Event/EC_Lifetime_Utils.h" +#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -286,7 +286,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "ECG_Mcast_EH.i" +#include "orbsvcs/Event/ECG_Mcast_EH.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index b499851083a..723466ea888 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "ECG_Mcast_Gateway.h" +#include "orbsvcs/Event/ECG_Mcast_Gateway.h" -#include "EC_Lifetime_Utils_T.h" -#include "ECG_Simple_Address_Server.h" -#include "ECG_Complex_Address_Server.h" -#include "ECG_Simple_Mcast_EH.h" -#include "ECG_Mcast_EH.h" -#include "ECG_UDP_EH.h" +#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/Event/ECG_Simple_Address_Server.h" +#include "orbsvcs/Event/ECG_Complex_Address_Server.h" +#include "orbsvcs/Event/ECG_Simple_Mcast_EH.h" +#include "orbsvcs/Event/ECG_Mcast_EH.h" +#include "orbsvcs/Event/ECG_UDP_EH.h" #include "orbsvcs/Event_Utilities.h" @@ -17,7 +17,7 @@ #include "ace/OS_NS_strings.h" #if ! defined (__ACE_INLINE__) -#include "ECG_Mcast_Gateway.i" +#include "orbsvcs/Event/ECG_Mcast_Gateway.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, ECG_Mcast_Gateway, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h index 978ff270cee..6aa690867f5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h @@ -12,16 +12,16 @@ #define TAO_ECG_MCAST_GATEWAY_H #include /**/ "ace/pre.h" -#include "ECG_UDP_Sender.h" +#include "orbsvcs/Event/ECG_UDP_Sender.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ECG_Defaults.h" +#include "orbsvcs/Event/ECG_Defaults.h" #include /**/ "event_serv_export.h" -#include "ECG_UDP_Receiver.h" -#include "ECG_UDP_Out_Endpoint.h" +#include "orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" #include "ace/SString.h" @@ -280,7 +280,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ECG_Mcast_Gateway.i" +#include "orbsvcs/Event/ECG_Mcast_Gateway.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_ECG_Mcast_Gateway) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp index 143f93a636e..0906d59820f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "EC_Gateway_IIOP.h" -#include "ECG_Reactive_ConsumerEC_Control.h" +#include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h" #include "tao/Messaging/Messaging.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h index 04f1de34b94..e7ccad73c2a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "ECG_ConsumerEC_Control.h" +#include "orbsvcs/Event/ECG_ConsumerEC_Control.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp index a44a1954a7f..2e14b4da681 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "EC_Gateway_IIOP.h" -#include "ECG_Reconnect_ConsumerEC_Control.h" +#include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h" #include "tao/Messaging/Messaging.h" #include "tao/ORB_Core.h" #include "ace/Reactor.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h index ef9bf5e91d7..b1f4a6c2987 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "ECG_ConsumerEC_Control.h" +#include "orbsvcs/Event/ECG_ConsumerEC_Control.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp index cb53560d707..064d5c35183 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "ECG_Simple_Address_Server.h" +#include "orbsvcs/Event/ECG_Simple_Address_Server.h" #if !defined(__ACE_INLINE__) -#include "ECG_Simple_Address_Server.i" +#include "orbsvcs/Event/ECG_Simple_Address_Server.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h index 955e24ae51c..4c0cb219ccc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/RtecUDPAdminS.h" -#include "EC_Lifetime_Utils_T.h" +#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" #include "ace/INET_Addr.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -62,7 +62,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "ECG_Simple_Address_Server.i" +#include "orbsvcs/Event/ECG_Simple_Address_Server.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp index 1009f8b4e00..fa40043a50f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ECG_Simple_Mcast_EH.h" +#include "orbsvcs/Event/ECG_Simple_Mcast_EH.h" #include "ace/Log_Msg.h" #include "ace/Reactor.h" #include "ace/os_include/os_fcntl.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h index e2306a5cdd4..89d272957ea 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h @@ -19,7 +19,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ "event_serv_export.h" -#include "ECG_Adapters.h" +#include "orbsvcs/Event/ECG_Adapters.h" #include "ace/SOCK_Dgram_Mcast.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp index b7e435f23f3..257a8ff2c3b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "ECG_UDP_EH.h" +#include "orbsvcs/Event/ECG_UDP_EH.h" #include "ace/Reactor.h" #include "ace/INET_Addr.h" #if !defined(__ACE_INLINE__) -#include "ECG_UDP_EH.i" +#include "orbsvcs/Event/ECG_UDP_EH.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, ECG_UDP_EH, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h index 966c27ac2b9..43deff19a68 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h @@ -22,7 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ "event_serv_export.h" -#include "ECG_Adapters.h" +#include "orbsvcs/Event/ECG_Adapters.h" #include "ace/SOCK_Dgram.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -103,7 +103,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "ECG_UDP_EH.i" +#include "orbsvcs/Event/ECG_UDP_EH.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp index 8f5af1c7ffe..5d5366ab294 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "ECG_UDP_Out_Endpoint.h" +#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h" #include "ace/INET_Addr.h" #include "ace/Sock_Connect.h" #if !defined(__ACE_INLINE__) -#include "ECG_UDP_Out_Endpoint.i" +#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, ECG_UDP_Out_Endpoint, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h index 5d15185c221..b3923400ea9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h @@ -100,7 +100,7 @@ typedef ACE_Refcounted_Auto_Ptr<TAO_ECG_UDP_Out_Endpoint,ACE_Null_Mutex> TAO_ECG TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "ECG_UDP_Out_Endpoint.i" +#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index b1b89afea29..1a492f72d66 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -5,7 +5,7 @@ #include "ace/SString.h" #if !defined(__ACE_INLINE__) -#include "ECG_UDP_Receiver.i" +#include "orbsvcs/Event/ECG_UDP_Receiver.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index bf8a08f5269..16fe00eec31 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -47,10 +47,10 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include /**/ "event_serv_export.h" -#include "ECG_Adapters.h" -#include "EC_Lifetime_Utils.h" -#include "EC_Lifetime_Utils_T.h" -#include "ECG_CDR_Message_Receiver.h" +#include "orbsvcs/Event/ECG_Adapters.h" +#include "orbsvcs/Event/EC_Lifetime_Utils.h" +#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/Event/ECG_CDR_Message_Receiver.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Reactor; @@ -232,7 +232,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "ECG_UDP_Receiver.i" +#include "orbsvcs/Event/ECG_UDP_Receiver.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index 9186de3d2dc..2cfc4b5f35f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -14,7 +14,7 @@ #include "tao/CDR.h" #if !defined(__ACE_INLINE__) -#include "ECG_UDP_Sender.inl" +#include "orbsvcs/Event/ECG_UDP_Sender.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 2945fdaea7b..50c16f7d31c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -48,9 +48,9 @@ #include /**/ "event_serv_export.h" #include "orbsvcs/RtecEventChannelAdminS.h" -#include "EC_Lifetime_Utils.h" -#include "EC_Lifetime_Utils_T.h" -#include "ECG_CDR_Message_Sender.h" +#include "orbsvcs/Event/EC_Lifetime_Utils.h" +#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/Event/ECG_CDR_Message_Sender.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_SOCK_Dgram; @@ -223,7 +223,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "ECG_UDP_Sender.inl" +#include "orbsvcs/Event/ECG_UDP_Sender.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp index 94317bbe11c..715979d31a9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_And_Filter.h" +#include "orbsvcs/Event/EC_And_Filter.h" ACE_RCSID(Event, EC_And_Filter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h index 7fa8c6dc5cd..67c9614af70 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h @@ -17,7 +17,7 @@ #define TAO_EC_AND_FILTER_H #include /**/ "ace/pre.h" -#include "EC_Filter.h" +#include "orbsvcs/Event/EC_Filter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index 9cf1a452ceb..e9bc5dcb730 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -1,19 +1,19 @@ // $Id$ -#include "EC_Basic_Factory.h" -#include "EC_Reactive_Dispatching.h" -#include "EC_Basic_Filter_Builder.h" -#include "EC_Trivial_Supplier_Filter.h" -#include "EC_ConsumerAdmin.h" -#include "EC_SupplierAdmin.h" -#include "EC_Default_ProxyConsumer.h" -#include "EC_Default_ProxySupplier.h" -#include "EC_ObserverStrategy.h" -#include "EC_Null_Scheduling.h" -#include "EC_Reactive_Timeout_Generator.h" -#include "EC_Reactive_ConsumerControl.h" -#include "EC_Reactive_SupplierControl.h" -#include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug +#include "orbsvcs/Event/EC_Basic_Factory.h" +#include "orbsvcs/Event/EC_Reactive_Dispatching.h" +#include "orbsvcs/Event/EC_Basic_Filter_Builder.h" +#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/Event/EC_Default_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Default_ProxySupplier.h" +#include "orbsvcs/Event/EC_ObserverStrategy.h" +#include "orbsvcs/Event/EC_Null_Scheduling.h" +#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h" +#include "orbsvcs/Event/EC_Reactive_ConsumerControl.h" +#include "orbsvcs/Event/EC_Reactive_SupplierControl.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" // @@ MSVC 6 bug #include "orbsvcs/ESF/ESF_Proxy_List.h" #include "orbsvcs/ESF/ESF_Delayed_Changes.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h index adc8ed097d0..aa942b26492 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "EC_Factory.h" +#include "orbsvcs/Event/EC_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index c2ccd077a81..e8149330316 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -1,18 +1,18 @@ // $Id$ #include "orbsvcs/Event_Service_Constants.h" -#include "EC_Basic_Filter_Builder.h" -#include "EC_Type_Filter.h" -#include "EC_Conjunction_Filter.h" -#include "EC_Disjunction_Filter.h" -#include "EC_And_Filter.h" -#include "EC_Negation_Filter.h" -#include "EC_Bitmask_Filter.h" -#include "EC_Masked_Type_Filter.h" -#include "EC_Timeout_Filter.h" +#include "orbsvcs/Event/EC_Basic_Filter_Builder.h" +#include "orbsvcs/Event/EC_Type_Filter.h" +#include "orbsvcs/Event/EC_Conjunction_Filter.h" +#include "orbsvcs/Event/EC_Disjunction_Filter.h" +#include "orbsvcs/Event/EC_And_Filter.h" +#include "orbsvcs/Event/EC_Negation_Filter.h" +#include "orbsvcs/Event/EC_Bitmask_Filter.h" +#include "orbsvcs/Event/EC_Masked_Type_Filter.h" +#include "orbsvcs/Event/EC_Timeout_Filter.h" #if ! defined (__ACE_INLINE__) -#include "EC_Basic_Filter_Builder.i" +#include "orbsvcs/Event/EC_Basic_Filter_Builder.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Basic_Filter_Builder, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h index 084a80832bb..2655caa15c4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "EC_Filter_Builder.h" +#include "orbsvcs/Event/EC_Filter_Builder.h" #include /**/ "event_serv_export.h" @@ -73,7 +73,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Basic_Filter_Builder.i" +#include "orbsvcs/Event/EC_Basic_Filter_Builder.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp index a1773b467e7..7701ba4d1d1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_Bitmask_Filter.h" +#include "orbsvcs/Event/EC_Bitmask_Filter.h" ACE_RCSID(Event, EC_Bitmask_Filter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h index e2f8e11b273..4adb3903e6f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h @@ -17,7 +17,7 @@ #define TAO_EC_BITMASK_FILTER_H #include /**/ "ace/pre.h" -#include "EC_Filter.h" +#include "orbsvcs/Event/EC_Filter.h" #include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp index 8d35565f73b..f2cce60ee21 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp @@ -3,10 +3,10 @@ #ifndef TAO_EC_BUSY_LOCK_CPP #define TAO_EC_BUSY_LOCK_CPP -#include "EC_Busy_Lock.h" +#include "orbsvcs/Event/EC_Busy_Lock.h" #if ! defined (__ACE_INLINE__) -#include "EC_Busy_Lock.i" +#include "orbsvcs/Event/EC_Busy_Lock.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h index 6ea0048ae19..0f566aaf92f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h @@ -51,7 +51,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Busy_Lock.i" +#include "orbsvcs/Event/EC_Busy_Lock.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp index cf129fc768f..3759342a5e9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp @@ -6,7 +6,7 @@ * @author Marina Spivak <marina@atdesk.com> */ -#include "EC_Channel_Destroyer.h" +#include "orbsvcs/Event/EC_Channel_Destroyer.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h index c0800bc37ee..73e17d7155b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h @@ -11,7 +11,7 @@ #define EC_CHANNEL_DESTROYER__H_ #include /**/ "event_serv_export.h" -#include "EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "ace/Auto_Functor.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp index 8511a1580b7..e8fae3ae659 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_Conjunction_Filter.h" +#include "orbsvcs/Event/EC_Conjunction_Filter.h" ACE_RCSID(Event, EC_Conjunction_Filter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h index 261e9c37273..94713eae25c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h @@ -17,7 +17,7 @@ #define TAO_EC_CONJUNCTION_FILTER_H #include /**/ "ace/pre.h" -#include "EC_Filter.h" +#include "orbsvcs/Event/EC_Filter.h" #include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index 22b7e470556..73bf25fff47 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "EC_ConsumerAdmin.h" -#include "EC_ProxySupplier.h" -#include "EC_ProxyConsumer.h" -#include "EC_Event_Channel_Base.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_Base.h" #include "orbsvcs/ESF/ESF_Peer_Workers.h" #include "orbsvcs/ESF/ESF_Peer_Admin.h" #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h index 5e9cda19796..02999fcc410 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp index 5bb9aa0bba2..007d90bd404 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_ConsumerControl.h" +#include "orbsvcs/Event/EC_ConsumerControl.h" ACE_RCSID(Event, EC_ConsumerControl, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index 49da2e81864..c10cfbbb4cd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -1,23 +1,23 @@ // $Id$ -#include "EC_Default_Factory.h" -#include "EC_Reactive_Dispatching.h" -#include "EC_MT_Dispatching.h" -#include "EC_Basic_Filter_Builder.h" -#include "EC_Prefix_Filter_Builder.h" -#include "EC_ConsumerAdmin.h" -#include "EC_SupplierAdmin.h" -#include "EC_Default_ProxyConsumer.h" -#include "EC_Default_ProxySupplier.h" -#include "EC_Trivial_Supplier_Filter.h" -#include "EC_Per_Supplier_Filter.h" -#include "EC_ObserverStrategy.h" -#include "EC_Null_Scheduling.h" -#include "EC_Group_Scheduling.h" -#include "EC_Reactive_Timeout_Generator.h" -#include "EC_Event_Channel_Base.h" -#include "EC_Reactive_ConsumerControl.h" -#include "EC_Reactive_SupplierControl.h" +#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Reactive_Dispatching.h" +#include "orbsvcs/Event/EC_MT_Dispatching.h" +#include "orbsvcs/Event/EC_Basic_Filter_Builder.h" +#include "orbsvcs/Event/EC_Prefix_Filter_Builder.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/Event/EC_Default_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Default_ProxySupplier.h" +#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h" +#include "orbsvcs/Event/EC_Per_Supplier_Filter.h" +#include "orbsvcs/Event/EC_ObserverStrategy.h" +#include "orbsvcs/Event/EC_Null_Scheduling.h" +#include "orbsvcs/Event/EC_Group_Scheduling.h" +#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_Reactive_ConsumerControl.h" +#include "orbsvcs/Event/EC_Reactive_SupplierControl.h" #include "orbsvcs/ESF/ESF_Proxy_List.h" #include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h" @@ -35,7 +35,7 @@ #include "ace/Dynamic_Service.h" #if ! defined (__ACE_INLINE__) -#include "EC_Default_Factory.i" +#include "orbsvcs/Event/EC_Default_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Default_Factory, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h index 37b7fa36178..a5bce5d5df3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h @@ -17,13 +17,13 @@ #include /**/ "ace/pre.h" -#include "EC_Factory.h" +#include "orbsvcs/Event/EC_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "EC_Defaults.h" +#include "orbsvcs/Event/EC_Defaults.h" #include "ace/Service_Config.h" #include "ace/SString.h" @@ -190,7 +190,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Default_Factory.i" +#include "orbsvcs/Event/EC_Default_Factory.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_EC_Default_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp index 4399814bb2f..e3bca47a2d0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "EC_Default_ProxyConsumer.h" -#include "EC_Event_Channel_Base.h" -#include "EC_Supplier_Filter_Builder.h" -#include "EC_Supplier_Filter.h" +#include "orbsvcs/Event/EC_Default_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h" +#include "orbsvcs/Event/EC_Supplier_Filter.h" #include "ace/Synch_T.h" ACE_RCSID(Event, EC_Default_ProxyConsumer, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h index f45c4adedae..e08d7d4c092 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp index e796a3e562f..a431afb219f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "EC_Default_ProxySupplier.h" -#include "EC_Event_Channel_Base.h" -#include "EC_Filter_Builder.h" +#include "orbsvcs/Event/EC_Default_ProxySupplier.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_Filter_Builder.h" #include "ace/Reverse_Lock_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h index df169125676..ae59254ea93 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp index a703c917e56..9016401e2f4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_Disjunction_Filter.h" +#include "orbsvcs/Event/EC_Disjunction_Filter.h" ACE_RCSID(Event, EC_Disjunction_Filter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h index 473520b88d8..06585acb46d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h @@ -17,7 +17,7 @@ #define TAO_EC_DISJUNCTION_FILTER_H #include /**/ "ace/pre.h" -#include "EC_Filter.h" +#include "orbsvcs/Event/EC_Filter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp index 50c71ef885f..4e2ead6d6e1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "EC_Dispatching.h" -#include "EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_Dispatching.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" ACE_RCSID(Event, EC_Dispatching, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index 6585591bbd0..93b6952aa8d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "EC_Dispatching_Task.h" -#include "EC_ProxySupplier.h" -#include "EC_Defaults.h" +#include "orbsvcs/Event/EC_Dispatching_Task.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_Defaults.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_strings.h" #if ! defined (__ACE_INLINE__) -#include "EC_Dispatching_Task.i" +#include "orbsvcs/Event/EC_Dispatching_Task.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index 3be42dd67dd..0eab223a8fe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -188,7 +188,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Dispatching_Task.i" +#include "orbsvcs/Event/EC_Dispatching_Task.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_EC_Simple_Queue_Full_Action) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp index c4621550c90..b35602065d0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "EC_Event_Channel.h" -#include "EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" #include "ace/Dynamic_Service.h" ACE_RCSID(Event, EC_Event_Channel, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h index 8afbe38ef4e..a2aa9b95643 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp index 5440996bb38..cdb208fbb4a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "EC_Event_Channel_Base.h" -#include "EC_Dispatching.h" -#include "EC_ConsumerAdmin.h" -#include "EC_SupplierAdmin.h" -#include "EC_Timeout_Generator.h" -#include "EC_ObserverStrategy.h" -#include "EC_ConsumerControl.h" -#include "EC_SupplierControl.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.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 "ace/Dynamic_Service.h" #if ! defined (__ACE_INLINE__) -#include "EC_Event_Channel_Base.i" +#include "orbsvcs/Event/EC_Event_Channel_Base.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Event_Channel_Base, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h index 1b9f263fa86..b42632c4c43 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h @@ -20,13 +20,13 @@ #include /**/ "ace/pre.h" -#include "EC_Factory.h" +#include "orbsvcs/Event/EC_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "EC_Defaults.h" +#include "orbsvcs/Event/EC_Defaults.h" #include "orbsvcs/RtecEventChannelAdminS.h" @@ -369,7 +369,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Event_Channel_Base.i" +#include "orbsvcs/Event/EC_Event_Channel_Base.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp index 3dec63b81d3..0612521f408 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_Factory.h" +#include "orbsvcs/Event/EC_Factory.h" #include "ace/Dynamic_Service.h" ACE_RCSID(Event, EC_Factory, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp index 7d908e9ce85..55f0de96038 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "EC_Filter.h" -#include "EC_QOS_Info.h" +#include "orbsvcs/Event/EC_Filter.h" +#include "orbsvcs/Event/EC_QOS_Info.h" #include "tao/ORB_Constants.h" #if ! defined (__ACE_INLINE__) -#include "EC_Filter.i" +#include "orbsvcs/Event/EC_Filter.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h index fbede07f767..bc0de27ce98 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h @@ -217,7 +217,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Filter.i" +#include "orbsvcs/Event/EC_Filter.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp index 164e044bece..07934456276 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "EC_Filter_Builder.h" -#include "EC_Filter.h" +#include "orbsvcs/Event/EC_Filter_Builder.h" +#include "orbsvcs/Event/EC_Filter.h" #if ! defined (__ACE_INLINE__) -#include "EC_Filter_Builder.i" +#include "orbsvcs/Event/EC_Filter_Builder.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Filter_Builder, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h index 9195ccc88e8..1017dfe5596 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h @@ -84,7 +84,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL // **************************************************************** #if defined (__ACE_INLINE__) -#include "EC_Filter_Builder.i" +#include "orbsvcs/Event/EC_Filter_Builder.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index d52e1844a9d..cf58d8cbd06 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -5,8 +5,8 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Time_Utilities.h" -#include "EC_Gateway_IIOP_Factory.h" -#include "ECG_ConsumerEC_Control.h" +#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h" +#include "orbsvcs/Event/ECG_ConsumerEC_Control.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h index 0a1ede60b4b..dd9263b3d4c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" #include /**/ "event_serv_export.h" -#include "EC_Gateway.h" +#include "orbsvcs/Event/EC_Gateway.h" #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/RtecEventCommS.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index ff9458ef6df..ec6b0f935ca 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -8,14 +8,14 @@ #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" -#include "ECG_ConsumerEC_Control.h" -#include "ECG_Reactive_ConsumerEC_Control.h" -#include "ECG_Reconnect_ConsumerEC_Control.h" -#include "EC_Gateway_IIOP.h" +#include "orbsvcs/Event/ECG_ConsumerEC_Control.h" +#include "orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h" +#include "orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h" +#include "orbsvcs/Event/EC_Gateway_IIOP.h" #include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) -#include "EC_Gateway_IIOP_Factory.i" +#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h index e85c361d6af..228e3756b1b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h @@ -107,7 +107,7 @@ ACE_STATIC_SVC_DECLARE (TAO_EC_Gateway_IIOP_Factory) ACE_FACTORY_DECLARE (TAO_RTEvent_Serv, TAO_EC_Gateway_IIOP_Factory) #if defined (__ACE_INLINE__) -#include "EC_Gateway_IIOP_Factory.i" +#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp index f86611872fb..1b1a0d4479e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_Gateway_Sched.h" +#include "orbsvcs/Event/EC_Gateway_Sched.h" #include "orbsvcs/Time_Utilities.h" ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h index 6ce4036b6a8..5267546de17 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h @@ -18,9 +18,9 @@ #define TAO_EC_GATEWAY_SCHED_H #include /**/ "ace/pre.h" -#include "EC_Gateway_IIOP.h" +#include "orbsvcs/Event/EC_Gateway_IIOP.h" #include "orbsvcs/RtecSchedulerC.h" -#include "sched_event_export.h" +#include "orbsvcs/Event/sched_event_export.h" // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp index 4634f940e41..9e39ef1f631 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "EC_Group_Scheduling.h" -#include "EC_QOS_Info.h" -#include "EC_Supplier_Filter.h" +#include "orbsvcs/Event/EC_Group_Scheduling.h" +#include "orbsvcs/Event/EC_QOS_Info.h" +#include "orbsvcs/Event/EC_Supplier_Filter.h" #if ! defined (__ACE_INLINE__) -#include "EC_Group_Scheduling.inl" +#include "orbsvcs/Event/EC_Group_Scheduling.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Group_Scheduling, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h index eee248749ec..1a9b35f07e2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h @@ -16,7 +16,7 @@ #define TAO_EC_GROUP_SCHEDULING_H #include /**/ "ace/pre.h" -#include "EC_Scheduling_Strategy.h" +#include "orbsvcs/Event/EC_Scheduling_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -49,7 +49,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "EC_Group_Scheduling.inl" +#include "orbsvcs/Event/EC_Group_Scheduling.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index db153bcf5c0..206d87f18a2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "EC_Kokyu_Dispatching.h" -#include "EC_Event_Channel_Base.h" -#include "EC_ProxySupplier.h" -#include "EC_QOS_Info.h" +#include "orbsvcs/Event/EC_Kokyu_Dispatching.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_QOS_Info.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/RtecSchedulerC.h" @@ -15,7 +15,7 @@ #include "Kokyu/Kokyu.h" #if ! defined (__ACE_INLINE__) -#include "EC_Kokyu_Dispatching.i" +#include "orbsvcs/Event/EC_Kokyu_Dispatching.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h index dbd9ecf523b..d9079a271ac 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h @@ -18,15 +18,15 @@ #define TAO_EC_KOKYU_DISPATCHING_H #include /**/ "ace/pre.h" -#include "EC_Dispatching.h" -#include "EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_Dispatching.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecSchedulerC.h" -#include "rtkokyu_event_export.h" +#include "orbsvcs/Event/rtkokyu_event_export.h" #include "ace/Thread_Manager.h" @@ -140,7 +140,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Kokyu_Dispatching.i" +#include "orbsvcs/Event/EC_Kokyu_Dispatching.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp index a1ed1476a1b..2df728b8920 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "EC_Kokyu_Factory.h" -#include "EC_Kokyu_Dispatching.h" -#include "EC_Kokyu_Scheduling.h" -#include "EC_Kokyu_Filter_Builder.h" -#include "EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_Kokyu_Factory.h" +#include "orbsvcs/Event/EC_Kokyu_Dispatching.h" +#include "orbsvcs/Event/EC_Kokyu_Scheduling.h" +#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "orbsvcs/RtecSchedulerC.h" #include "ace/Arg_Shifter.h" @@ -12,7 +12,7 @@ #include "ace/OS_NS_strings.h" #if ! defined (__ACE_INLINE__) -#include "EC_Kokyu_Factory.i" +#include "orbsvcs/Event/EC_Kokyu_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h index f4d5189edeb..4e2f413ca42 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h @@ -17,13 +17,13 @@ #define TAO_EC_KOKYU_FACTORY_H #include /**/ "ace/pre.h" -#include "EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Default_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "rtkokyu_event_export.h" +#include "orbsvcs/Event/rtkokyu_event_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -68,7 +68,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Kokyu_Factory.i" +#include "orbsvcs/Event/EC_Kokyu_Factory.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_EC_Kokyu_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp index 03e5d7011dd..ab2015ea52d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "EC_Kokyu_Filter.h" -#include "EC_QOS_Info.h" +#include "orbsvcs/Event/EC_Kokyu_Filter.h" +#include "orbsvcs/Event/EC_QOS_Info.h" #include "ace/Log_Msg.h" ACE_RCSID(Event, EC_Kokyu_Filter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h index 1a25362739d..09f521997d4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h @@ -16,14 +16,14 @@ #define TAO_EC_KOKYU_FILTER_H #include /**/ "ace/pre.h" -#include "EC_Filter.h" +#include "orbsvcs/Event/EC_Filter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecSchedulerC.h" -#include "rtkokyu_event_export.h" +#include "orbsvcs/Event/rtkokyu_event_export.h" #include "ace/SString.h" //#define EC_KOKYU_LOGGING diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp index 27557f5e52c..a522ce4d5ac 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "EC_Kokyu_Filter.h" +#include "orbsvcs/Event/EC_Kokyu_Filter.h" #include "orbsvcs/Event_Service_Constants.h" -#include "EC_Kokyu_Filter_Builder.h" -#include "EC_Type_Filter.h" -#include "EC_Conjunction_Filter.h" -#include "EC_Disjunction_Filter.h" -#include "EC_Timeout_Filter.h" -#include "EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.h" +#include "orbsvcs/Event/EC_Type_Filter.h" +#include "orbsvcs/Event/EC_Conjunction_Filter.h" +#include "orbsvcs/Event/EC_Disjunction_Filter.h" +#include "orbsvcs/Event/EC_Timeout_Filter.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "ace/OS_NS_stdio.h" #if ! defined (__ACE_INLINE__) -#include "EC_Kokyu_Filter_Builder.i" +#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h index a7e695ee686..83ac33a6456 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h @@ -17,13 +17,13 @@ #define TAO_EC_KOKYU_FILTER_BUILDER_H #include /**/ "ace/pre.h" -#include "EC_Filter_Builder.h" +#include "orbsvcs/Event/EC_Filter_Builder.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "rtkokyu_event_export.h" +#include "orbsvcs/Event/rtkokyu_event_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -82,7 +82,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Kokyu_Filter_Builder.i" +#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp index 9b35aa83642..979cd0913fa 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "EC_Kokyu_Scheduling.h" -#include "EC_QOS_Info.h" -#include "EC_ProxyConsumer.h" -#include "EC_ProxySupplier.h" -#include "EC_Supplier_Filter.h" +#include "orbsvcs/Event/EC_Kokyu_Scheduling.h" +#include "orbsvcs/Event/EC_QOS_Info.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_Supplier_Filter.h" #if ! defined (__ACE_INLINE__) -#include "EC_Kokyu_Scheduling.i" +#include "orbsvcs/Event/EC_Kokyu_Scheduling.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Kokyu_Scheduling, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h index 7996a8b280f..105241d217a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h @@ -18,14 +18,14 @@ #define TAO_EC_KOKYU_SCHEDULING_H #include /**/ "ace/pre.h" -#include "EC_Scheduling_Strategy.h" +#include "orbsvcs/Event/EC_Scheduling_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecSchedulerC.h" -#include "rtkokyu_event_export.h" +#include "orbsvcs/Event/rtkokyu_event_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -70,7 +70,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Kokyu_Scheduling.i" +#include "orbsvcs/Event/EC_Kokyu_Scheduling.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp index 8bb0dcc711c..9750da7a5d7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "EC_Lifetime_Utils.h" +#include "orbsvcs/Event/EC_Lifetime_Utils.h" #if !defined(__ACE_INLINE__) -#include "EC_Lifetime_Utils.i" +#include "orbsvcs/Event/EC_Lifetime_Utils.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h index 4705b95c008..25ae4a280a6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h @@ -210,7 +210,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Lifetime_Utils.i" +#include "orbsvcs/Event/EC_Lifetime_Utils.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp index 09b05fecaa4..8a8d4934d40 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp @@ -3,10 +3,10 @@ #ifndef TAO_EC_LIFETIME_UTILS_T_CPP #define TAO_EC_LIFETIME_UTILS_T_CPP -#include "EC_Lifetime_Utils_T.h" +#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" #if ! defined (__ACE_INLINE__) -#include "EC_Lifetime_Utils_T.i" +#include "orbsvcs/Event/EC_Lifetime_Utils_T.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h index fe7d6a3769e..85b98439126 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h @@ -17,7 +17,7 @@ #ifndef TAO_EC_LIFETIME_UTILS_T_H #define TAO_EC_LIFETIME_UTILS_T_H -#include "EC_Lifetime_Utils.h" +#include "orbsvcs/Event/EC_Lifetime_Utils.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -189,11 +189,11 @@ bool operator!=(TAO_EC_Servant_Var<X> const & x, TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Lifetime_Utils_T.i" +#include "orbsvcs/Event/EC_Lifetime_Utils_T.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "EC_Lifetime_Utils_T.cpp" +#include "orbsvcs/Event/EC_Lifetime_Utils_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index b6d91f832f0..096ae4c3ba0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_MT_Dispatching.h" +#include "orbsvcs/Event/EC_MT_Dispatching.h" ACE_RCSID(Event, EC_MT_Dispatching, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h index c4cf13dc43b..b38b5a160fd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h @@ -17,13 +17,13 @@ #define TAO_EC_MT_DISPATCHING_H #include /**/ "ace/pre.h" -#include "EC_Dispatching.h" +#include "orbsvcs/Event/EC_Dispatching.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "EC_Dispatching_Task.h" +#include "orbsvcs/Event/EC_Dispatching_Task.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp index 7500d99f05e..0ab3197ef29 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_Masked_Type_Filter.h" +#include "orbsvcs/Event/EC_Masked_Type_Filter.h" ACE_RCSID(Event, EC_Masked_Type_Filter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h index 5caaeecd010..97a83d622ea 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h @@ -17,7 +17,7 @@ #define TAO_EC_MASKED_TYPE_FILTER_H #include /**/ "ace/pre.h" -#include "EC_Filter.h" +#include "orbsvcs/Event/EC_Filter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp index 72ad44e9fed..204685379ac 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_Negation_Filter.h" +#include "orbsvcs/Event/EC_Negation_Filter.h" ACE_RCSID(Event, EC_Negation_Filter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h index f4612a7ef83..1b0cad637f4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h @@ -17,7 +17,7 @@ #define TAO_EC_NEGATION_FILTER_H #include /**/ "ace/pre.h" -#include "EC_Filter.h" +#include "orbsvcs/Event/EC_Filter.h" #include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index 3284ec0819d..5b829d361c6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp @@ -1,19 +1,19 @@ // $Id$ -#include "EC_Null_Factory.h" -#include "EC_Reactive_Dispatching.h" -#include "EC_Filter_Builder.h" -#include "EC_Trivial_Supplier_Filter.h" -#include "EC_ConsumerAdmin.h" -#include "EC_SupplierAdmin.h" -#include "EC_Default_ProxyConsumer.h" -#include "EC_Default_ProxySupplier.h" -#include "EC_ObserverStrategy.h" -#include "EC_Null_Scheduling.h" -#include "EC_Reactive_Timeout_Generator.h" -#include "EC_ConsumerControl.h" -#include "EC_SupplierControl.h" -#include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug +#include "orbsvcs/Event/EC_Null_Factory.h" +#include "orbsvcs/Event/EC_Reactive_Dispatching.h" +#include "orbsvcs/Event/EC_Filter_Builder.h" +#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/Event/EC_Default_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Default_ProxySupplier.h" +#include "orbsvcs/Event/EC_ObserverStrategy.h" +#include "orbsvcs/Event/EC_Null_Scheduling.h" +#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h" +#include "orbsvcs/Event/EC_ConsumerControl.h" +#include "orbsvcs/Event/EC_SupplierControl.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" // @@ MSVC 6 bug #include "orbsvcs/ESF/ESF_Proxy_List.h" #include "orbsvcs/ESF/ESF_Immediate_Changes.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h index 2f96a0b0dd0..ca583ca5d13 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h @@ -17,7 +17,7 @@ #define TAO_EC_NULL_FACTORY_H #include /**/ "ace/pre.h" -#include "EC_Factory.h" +#include "orbsvcs/Event/EC_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp index 5b032866004..e17a6de3910 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "EC_Null_Scheduling.h" -#include "EC_QOS_Info.h" -#include "EC_Supplier_Filter.h" +#include "orbsvcs/Event/EC_Null_Scheduling.h" +#include "orbsvcs/Event/EC_QOS_Info.h" +#include "orbsvcs/Event/EC_Supplier_Filter.h" #if ! defined (__ACE_INLINE__) -#include "EC_Null_Scheduling.i" +#include "orbsvcs/Event/EC_Null_Scheduling.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Null_Scheduling, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h index 4e95326cd82..90857214aeb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "EC_Scheduling_Strategy.h" +#include "orbsvcs/Event/EC_Scheduling_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -52,7 +52,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "EC_Null_Scheduling.i" +#include "orbsvcs/Event/EC_Null_Scheduling.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 48f88abd928..e5c5a9bc11d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -1,16 +1,16 @@ // $Id$ -#include "EC_ObserverStrategy.h" -#include "EC_Event_Channel_Base.h" -#include "EC_ProxySupplier.h" -#include "EC_ProxyConsumer.h" -#include "EC_ConsumerAdmin.h" -#include "EC_SupplierAdmin.h" +#include "orbsvcs/Event/EC_ObserverStrategy.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_SupplierAdmin.h" #include "orbsvcs/Event_Service_Constants.h" #include "ace/Auto_Ptr.h" #if ! defined (__ACE_INLINE__) -#include "EC_ObserverStrategy.i" +#include "orbsvcs/Event/EC_ObserverStrategy.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_ObserverStrategy, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h index ac1f428ef78..20fd2b51d2b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h @@ -354,7 +354,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_ObserverStrategy.i" +#include "orbsvcs/Event/EC_ObserverStrategy.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index 2d27cfc7f77..fe0ed5c6cc8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -1,18 +1,18 @@ // $Id$ -#include "EC_Per_Supplier_Filter.h" -#include "EC_Event_Channel_Base.h" -#include "EC_ProxySupplier.h" -#include "EC_ProxyConsumer.h" -#include "EC_Scheduling_Strategy.h" -#include "EC_QOS_Info.h" +#include "orbsvcs/Event/EC_Per_Supplier_Filter.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Scheduling_Strategy.h" +#include "orbsvcs/Event/EC_QOS_Info.h" #include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) -#include "EC_Per_Supplier_Filter.i" +#include "orbsvcs/Event/EC_Per_Supplier_Filter.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Per_Supplier_Filter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h index 5bd8473b13b..ae1660ed2fb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h @@ -16,8 +16,8 @@ #define TAO_EC_PER_SUPPLIER_FILTER_H #include /**/ "ace/pre.h" -#include "EC_Supplier_Filter.h" -#include "EC_Supplier_Filter_Builder.h" +#include "orbsvcs/Event/EC_Supplier_Filter.h" +#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h" #include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -115,7 +115,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Per_Supplier_Filter.i" +#include "orbsvcs/Event/EC_Per_Supplier_Filter.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index 35590ac3314..61b79c68726 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -1,18 +1,18 @@ // $Id$ #include "orbsvcs/Event_Service_Constants.h" -#include "EC_Prefix_Filter_Builder.h" -#include "EC_Type_Filter.h" -#include "EC_Conjunction_Filter.h" -#include "EC_Disjunction_Filter.h" -#include "EC_And_Filter.h" -#include "EC_Negation_Filter.h" -#include "EC_Bitmask_Filter.h" -#include "EC_Masked_Type_Filter.h" -#include "EC_Timeout_Filter.h" +#include "orbsvcs/Event/EC_Prefix_Filter_Builder.h" +#include "orbsvcs/Event/EC_Type_Filter.h" +#include "orbsvcs/Event/EC_Conjunction_Filter.h" +#include "orbsvcs/Event/EC_Disjunction_Filter.h" +#include "orbsvcs/Event/EC_And_Filter.h" +#include "orbsvcs/Event/EC_Negation_Filter.h" +#include "orbsvcs/Event/EC_Bitmask_Filter.h" +#include "orbsvcs/Event/EC_Masked_Type_Filter.h" +#include "orbsvcs/Event/EC_Timeout_Filter.h" #if ! defined (__ACE_INLINE__) -#include "EC_Prefix_Filter_Builder.i" +#include "orbsvcs/Event/EC_Prefix_Filter_Builder.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Prefix_Filter_Builder, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h index db0dfef1076..7938278e895 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h @@ -16,7 +16,7 @@ #define TAO_EC_PREFIX_FILTER_BUILDER_H #include /**/ "ace/pre.h" -#include "EC_Filter_Builder.h" +#include "orbsvcs/Event/EC_Filter_Builder.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -65,7 +65,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Prefix_Filter_Builder.i" +#include "orbsvcs/Event/EC_Prefix_Filter_Builder.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index 89c22f0a791..1e41905c0ca 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "EC_Priority_Dispatching.h" -#include "EC_Dispatching_Task.h" -#include "EC_Event_Channel_Base.h" -#include "EC_QOS_Info.h" +#include "orbsvcs/Event/EC_Priority_Dispatching.h" +#include "orbsvcs/Event/EC_Dispatching_Task.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_QOS_Info.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/RtecSchedulerC.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h index 2393868d7a2..ebbb6cd6085 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h @@ -17,14 +17,14 @@ #define TAO_EC_PRIORITY_DISPATCHING_H #include /**/ "ace/pre.h" -#include "EC_Dispatching.h" +#include "orbsvcs/Event/EC_Dispatching.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecSchedulerC.h" -#include "sched_event_export.h" +#include "orbsvcs/Event/sched_event_export.h" #include "ace/Thread_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp index 826cd5b1732..0bf92510d54 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "EC_Priority_Scheduling.h" -#include "EC_QOS_Info.h" -#include "EC_ProxyConsumer.h" -#include "EC_ProxySupplier.h" -#include "EC_Supplier_Filter.h" +#include "orbsvcs/Event/EC_Priority_Scheduling.h" +#include "orbsvcs/Event/EC_QOS_Info.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_Supplier_Filter.h" #if ! defined (__ACE_INLINE__) -#include "EC_Priority_Scheduling.i" +#include "orbsvcs/Event/EC_Priority_Scheduling.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Priority_Scheduling, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h index 87bac43db35..ef5be319f06 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h @@ -17,14 +17,14 @@ #define TAO_EC_PRIORITY_SCHEDULING_H #include /**/ "ace/pre.h" -#include "EC_Scheduling_Strategy.h" +#include "orbsvcs/Event/EC_Scheduling_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecSchedulerC.h" -#include "sched_event_export.h" +#include "orbsvcs/Event/sched_event_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -69,7 +69,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Priority_Scheduling.i" +#include "orbsvcs/Event/EC_Priority_Scheduling.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp index 422cd66246d..f16960141c1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "EC_ProxyConsumer.h" -#include "EC_Event_Channel_Base.h" -#include "EC_Supplier_Filter.h" -#include "EC_Supplier_Filter_Builder.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_Supplier_Filter.h" +#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h" #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "EC_ProxyConsumer.i" +#include "orbsvcs/Event/EC_ProxyConsumer.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index bd233ee352d..50b73ce6d68 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -230,7 +230,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_ProxyConsumer.i" +#include "orbsvcs/Event/EC_ProxyConsumer.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index 7e4528a8ea1..37204dcf67b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -1,20 +1,20 @@ // $Id$ -#include "EC_ProxySupplier.h" -#include "EC_Dispatching.h" -#include "EC_Filter_Builder.h" -#include "EC_QOS_Info.h" -#include "EC_Event_Channel_Base.h" -#include "EC_Scheduling_Strategy.h" -#include "EC_ConsumerControl.h" -#include "EC_SupplierAdmin.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_Base.h" +#include "orbsvcs/Event/EC_Scheduling_Strategy.h" +#include "orbsvcs/Event/EC_ConsumerControl.h" +#include "orbsvcs/Event/EC_SupplierAdmin.h" #include "orbsvcs/ESF/ESF_RefCount_Guard.h" #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" #include "ace/Reverse_Lock_T.h" #if ! defined (__ACE_INLINE__) -#include "EC_ProxySupplier.i" +#include "orbsvcs/Event/EC_ProxySupplier.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index 00c54457491..bb14e56895b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -19,7 +19,7 @@ #include "orbsvcs/RtecEventChannelAdminS.h" -#include "EC_Filter.h" +#include "orbsvcs/Event/EC_Filter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -223,7 +223,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_ProxySupplier.i" +#include "orbsvcs/Event/EC_ProxySupplier.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp index 01fbdb367ac..557a2b4f708 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp @@ -6,7 +6,7 @@ * @author Carlos O'Ryan <coryan@atdesk.com> */ -#include "EC_Proxy_Disconnector.h" +#include "orbsvcs/Event/EC_Proxy_Disconnector.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp index a2c8154ff76..4680bda962f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "EC_QOS_Info.h" +#include "orbsvcs/Event/EC_QOS_Info.h" #if ! defined (__ACE_INLINE__) -#include "EC_QOS_Info.i" +#include "orbsvcs/Event/EC_QOS_Info.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_QOS_Info, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h index 27147c7e370..e5e8fcd8d49 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h @@ -62,7 +62,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_QOS_Info.i" +#include "orbsvcs/Event/EC_QOS_Info.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp index 7d4ab3572a6..f57b86ae813 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_RTCORBA_Dispatching.h" +#include "orbsvcs/Event/EC_RTCORBA_Dispatching.h" #include "tao/RTCORBA/Priority_Mapping.h" ACE_RCSID(Event, EC_RTCORBA_Dispatching, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h index 24450749ce9..cb6e87fdad2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h @@ -16,14 +16,14 @@ #define TAO_EC_RTCORBA_DISPATCHING_H #include /**/ "ace/pre.h" -#include "rtcorba_event_export.h" -#include "EC_Dispatching.h" +#include "orbsvcs/Event/rtcorba_event_export.h" +#include "orbsvcs/Event/EC_Dispatching.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "EC_Dispatching_Task.h" +#include "orbsvcs/Event/EC_Dispatching_Task.h" #include "tao/RTCORBA/RTCORBA.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp index ccdf2294201..087ffc53b03 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "EC_RTCORBA_Dispatching.h" -#include "EC_RTCORBA_Factory.h" +#include "orbsvcs/Event/EC_RTCORBA_Dispatching.h" +#include "orbsvcs/Event/EC_RTCORBA_Factory.h" #include "tao/RTCORBA/Priority_Mapping_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h index 9a5d39060f9..a76bc59f73d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h @@ -16,8 +16,8 @@ #define TAO_EC_RTCORBA_FACTORY_H #include /**/ "ace/pre.h" -#include "rtcorba_event_export.h" -#include "EC_Factory.h" +#include "orbsvcs/Event/rtcorba_event_export.h" +#include "orbsvcs/Event/EC_Factory.h" #include "tao/RTCORBA/RTCORBA.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index 5bd92f5a821..a8aafe81f0b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "EC_ConsumerAdmin.h" -#include "EC_Reactive_ConsumerControl.h" -#include "EC_Event_Channel_Base.h" -#include "EC_ProxySupplier.h" -#include "EC_ProxyConsumer.h" // @@ MSVC 6 bug +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_Reactive_ConsumerControl.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" // @@ MSVC 6 bug #include "tao/Messaging/Messaging.h" #include "tao/ORB_Core.h" @@ -12,7 +12,7 @@ #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "EC_Reactive_ConsumerControl.i" +#include "orbsvcs/Event/EC_Reactive_ConsumerControl.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Reactive_ConsumerControl, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h index 32cafb85965..d6e8cf176d5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "EC_ConsumerControl.h" +#include "orbsvcs/Event/EC_ConsumerControl.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -147,7 +147,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Reactive_ConsumerControl.i" +#include "orbsvcs/Event/EC_Reactive_ConsumerControl.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp index 6a1c4a72ceb..eb7b1bd5b7d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "EC_Reactive_Dispatching.h" -#include "EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_Reactive_Dispatching.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" ACE_RCSID(Event, EC_Reactive_Dispatching, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h index 07ced1c71e6..139c650e1e7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "EC_Dispatching.h" +#include "orbsvcs/Event/EC_Dispatching.h" #include /**/ "event_serv_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index 57f0c1a60de..10cdcd05bdb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "EC_SupplierAdmin.h" -#include "EC_Reactive_SupplierControl.h" -#include "EC_Event_Channel_Base.h" -#include "EC_ProxyConsumer.h" -#include "EC_ProxySupplier.h" // @@ MSVC 6 bug +#include "orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/Event/EC_Reactive_SupplierControl.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" // @@ MSVC 6 bug #include "tao/Messaging/Messaging.h" #include "tao/ORB_Core.h" @@ -12,7 +12,7 @@ #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "EC_Reactive_SupplierControl.i" +#include "orbsvcs/Event/EC_Reactive_SupplierControl.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Reactive_SupplierControl, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h index a66a677dd41..141ddf9668c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "EC_SupplierControl.h" +#include "orbsvcs/Event/EC_SupplierControl.h" #include "orbsvcs/ESF/ESF_Worker.h" @@ -158,7 +158,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Reactive_SupplierControl.i" +#include "orbsvcs/Event/EC_Reactive_SupplierControl.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp index 822b84f33ce..fbdfb022768 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_Reactive_Timeout_Generator.h" +#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h" #include "ace/Reactor.h" ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h index 9a836a34cd4..8ab4d18da31 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "EC_Timeout_Generator.h" +#include "orbsvcs/Event/EC_Timeout_Generator.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 6722ceaed03..66c4afcc9ac 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "EC_Sched_Factory.h" -#include "EC_Priority_Dispatching.h" -#include "EC_Priority_Scheduling.h" -#include "EC_Sched_Filter_Builder.h" -#include "EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_Sched_Factory.h" +#include "orbsvcs/Event/EC_Priority_Dispatching.h" +#include "orbsvcs/Event/EC_Priority_Scheduling.h" +#include "orbsvcs/Event/EC_Sched_Filter_Builder.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "orbsvcs/RtecSchedulerC.h" #include "ace/Arg_Shifter.h" @@ -12,7 +12,7 @@ #include "ace/OS_NS_strings.h" #if ! defined (__ACE_INLINE__) -#include "EC_Sched_Factory.i" +#include "orbsvcs/Event/EC_Sched_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Sched_Factory, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h index 46970877f49..b7b82d791fc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h @@ -16,13 +16,13 @@ #define TAO_EC_SCHED_FACTORY_H #include /**/ "ace/pre.h" -#include "EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Default_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "sched_event_export.h" +#include "orbsvcs/Event/sched_event_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -61,7 +61,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Sched_Factory.i" +#include "orbsvcs/Event/EC_Sched_Factory.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE (TAO_EC_Sched_Factory) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp index 222ddc4ec00..3eb8e03e214 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "EC_Sched_Filter.h" -#include "EC_QOS_Info.h" +#include "orbsvcs/Event/EC_Sched_Filter.h" +#include "orbsvcs/Event/EC_QOS_Info.h" #include "ace/Log_Msg.h" ACE_RCSID(Event, EC_Sched_Filter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h index 85e33bf958c..5645a6eac92 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h @@ -16,14 +16,14 @@ #define TAO_EC_SCHED_FILTER_H #include /**/ "ace/pre.h" -#include "EC_Filter.h" +#include "orbsvcs/Event/EC_Filter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/RtecSchedulerC.h" -#include "sched_event_export.h" +#include "orbsvcs/Event/sched_event_export.h" #include "ace/SString.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 64380dac04b..95ef9e1886e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "EC_Sched_Filter.h" +#include "orbsvcs/Event/EC_Sched_Filter.h" #include "orbsvcs/Event_Service_Constants.h" -#include "EC_Sched_Filter_Builder.h" -#include "EC_Type_Filter.h" -#include "EC_Conjunction_Filter.h" -#include "EC_Disjunction_Filter.h" -#include "EC_Timeout_Filter.h" -#include "EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_Sched_Filter_Builder.h" +#include "orbsvcs/Event/EC_Type_Filter.h" +#include "orbsvcs/Event/EC_Conjunction_Filter.h" +#include "orbsvcs/Event/EC_Disjunction_Filter.h" +#include "orbsvcs/Event/EC_Timeout_Filter.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "ace/OS_NS_stdio.h" #if ! defined (__ACE_INLINE__) -#include "EC_Sched_Filter_Builder.i" +#include "orbsvcs/Event/EC_Sched_Filter_Builder.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Sched_Filter_Builder, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h index b435aaaae73..c649518ecbe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h @@ -17,13 +17,13 @@ #define TAO_EC_SCHED_FILTER_BUILDER_H #include /**/ "ace/pre.h" -#include "EC_Filter_Builder.h" +#include "orbsvcs/Event/EC_Filter_Builder.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "sched_event_export.h" +#include "orbsvcs/Event/sched_event_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -82,7 +82,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Sched_Filter_Builder.i" +#include "orbsvcs/Event/EC_Sched_Filter_Builder.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp index 87d5b4dd405..76be60d02ec 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "EC_Scheduling_Strategy.h" -#include "EC_QOS_Info.h" +#include "orbsvcs/Event/EC_Scheduling_Strategy.h" +#include "orbsvcs/Event/EC_QOS_Info.h" ACE_RCSID(Event, EC_Scheduling_Strategy, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index ea62768bca6..fb555cf3e95 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "EC_SupplierAdmin.h" -#include "EC_ProxyConsumer.h" -#include "EC_ProxySupplier.h" -#include "EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/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" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h index 0028d660e3f..b54d25ee39c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp index fc1f5a0e459..7d73bfbaf53 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_SupplierControl.h" +#include "orbsvcs/Event/EC_SupplierControl.h" ACE_RCSID(Event, EC_SupplierControl, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp index b80ec9317a4..1f424fd0575 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "EC_Supplier_Filter.h" -#include "EC_ProxySupplier.h" -#include "EC_QOS_Info.h" +#include "orbsvcs/Event/EC_Supplier_Filter.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_QOS_Info.h" #if ! defined (__ACE_INLINE__) -#include "EC_Supplier_Filter.i" +#include "orbsvcs/Event/EC_Supplier_Filter.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_Supplier_Filter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h index 503b04f2e0f..f9cf152d31d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h @@ -143,7 +143,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Supplier_Filter.i" +#include "orbsvcs/Event/EC_Supplier_Filter.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp index 0e1b93ac309..63203a004fa 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_Supplier_Filter_Builder.h" +#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h" ACE_RCSID(Event, EC_Supplier_Filter_Builder, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp index 45083447074..5649e048aa0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "EC_TPC_Dispatching.h" -#include "EC_Defaults.h" +#include "orbsvcs/Event/EC_TPC_Dispatching.h" +#include "orbsvcs/Event/EC_Defaults.h" #include <ace/Dynamic_Service.h> diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h index 929c0bade2a..b8c7ea49cd3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h @@ -16,13 +16,13 @@ #include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" -#include "EC_Dispatching.h" +#include "orbsvcs/Event/EC_Dispatching.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "EC_TPC_Dispatching_Task.h" +#include "orbsvcs/Event/EC_TPC_Dispatching_Task.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp index 12585c54101..f70fb6aeac9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_TPC_Dispatching_Task.h" +#include "orbsvcs/Event/EC_TPC_Dispatching_Task.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h index d183f2f29b4..ff92abce00b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h @@ -12,7 +12,7 @@ #define TAO_EC_TPC_DISPATCHING_TASK_H #include /**/ "ace/pre.h" -#include "EC_Dispatching_Task.h" +#include "orbsvcs/Event/EC_Dispatching_Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp index 31c47f25425..c8e822ed5b9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "EC_TPC_Factory.h" +#include "orbsvcs/Event/EC_TPC_Factory.h" -#include "EC_TPC_Dispatching.h" -#include "EC_TPC_ProxySupplier.h" -#include "EC_TPC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_TPC_Dispatching.h" +#include "orbsvcs/Event/EC_TPC_ProxySupplier.h" +#include "orbsvcs/Event/EC_TPC_ProxyConsumer.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h index 1b66e955d74..c65e5be61cc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h @@ -10,7 +10,7 @@ #define TAO_EC_TPC_FACTORY_H #include /**/ "ace/pre.h" -#include "EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Default_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp index 67e1da07b12..6a7cc347cb1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "EC_TPC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_TPC_ProxyConsumer.h" ACE_RCSID(Event, EC_TPC_ProxyConsumer, "$Id$") -#include "EC_Event_Channel_Base.h" -#include "EC_TPC_Dispatching.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_TPC_Dispatching.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h index ca594475c75..9fb7ff1dc0c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h @@ -13,7 +13,7 @@ #define TAO_EC_TPC_PROXYCONSUMER_H #include /**/ "ace/pre.h" -#include "EC_Default_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Default_ProxyConsumer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp index 5599d682b1e..6ead39a342e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "EC_TPC_ProxySupplier.h" +#include "orbsvcs/Event/EC_TPC_ProxySupplier.h" #if ! defined (__ACE_INLINE__) -#include "EC_TPC_ProxySupplier.i" +#include "orbsvcs/Event/EC_TPC_ProxySupplier.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Event, EC_TPC_ProxySupplier, "$Id$") -#include "EC_Event_Channel_Base.h" -#include "EC_TPC_Dispatching.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_TPC_Dispatching.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h index 73d3f124718..345b17c0619 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h @@ -12,7 +12,7 @@ #define TAO_EC_TPC_PROXYSUPPLIER_H #include /**/ "ace/pre.h" -#include "EC_Default_ProxySupplier.h" +#include "orbsvcs/Event/EC_Default_ProxySupplier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -56,7 +56,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_TPC_ProxySupplier.i" +#include "orbsvcs/Event/EC_TPC_ProxySupplier.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index cb06272aeb2..3b479983a13 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "EC_Timeout_Filter.h" -#include "EC_Timeout_Generator.h" -#include "EC_Event_Channel_Base.h" -#include "EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_Timeout_Filter.h" +#include "orbsvcs/Event/EC_Timeout_Generator.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) -#include "EC_Timeout_Filter.i" +#include "orbsvcs/Event/EC_Timeout_Filter.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h index 84e70df31f7..0658f0b0b46 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h @@ -18,13 +18,13 @@ #include /**/ "ace/pre.h" -#include "EC_Filter.h" +#include "orbsvcs/Event/EC_Filter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "EC_QOS_Info.h" +#include "orbsvcs/Event/EC_QOS_Info.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -112,7 +112,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Timeout_Filter.i" +#include "orbsvcs/Event/EC_Timeout_Filter.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index 56089a3605f..23d098ceba6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "EC_Timeout_Generator.h" -#include "EC_Timeout_Filter.h" +#include "orbsvcs/Event/EC_Timeout_Generator.h" +#include "orbsvcs/Event/EC_Timeout_Filter.h" #include "orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) -#include "EC_Timeout_Generator.i" +#include "orbsvcs/Event/EC_Timeout_Generator.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h index e81377e9c00..97ed9de0d08 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h @@ -25,7 +25,7 @@ #include /**/ "event_serv_export.h" -#include "EC_Timeout_Filter.h" +#include "orbsvcs/Event/EC_Timeout_Filter.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -93,7 +93,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EC_Timeout_Generator.i" +#include "orbsvcs/Event/EC_Timeout_Generator.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp index 8f943cb8e98..c5d3dc1b72c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "EC_Trivial_Supplier_Filter.h" -#include "EC_Event_Channel_Base.h" -#include "EC_ConsumerAdmin.h" -#include "EC_ProxySupplier.h" -#include "EC_QOS_Info.h" -#include "EC_Scheduling_Strategy.h" -#include "EC_ProxyConsumer.h" // @@ MSVC 6 bug +#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_QOS_Info.h" +#include "orbsvcs/Event/EC_Scheduling_Strategy.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" // @@ MSVC 6 bug ACE_RCSID(Event, EC_Trivial_Supplier_Filter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h index 4817c6315e2..52eba4364ff 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h @@ -18,8 +18,8 @@ #include /**/ "ace/pre.h" -#include "EC_Supplier_Filter.h" -#include "EC_Supplier_Filter_Builder.h" +#include "orbsvcs/Event/EC_Supplier_Filter.h" +#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h" #include /**/ "event_serv_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp index cc0e7ac7ec7..d52f1d869aa 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "EC_Type_Filter.h" +#include "orbsvcs/Event/EC_Type_Filter.h" ACE_RCSID(Event, EC_Type_Filter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h index 2b3ed11bc6a..78d8124be53 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h @@ -17,7 +17,7 @@ #define TAO_EC_TYPE_FILTER_H #include /**/ "ace/pre.h" -#include "EC_Filter.h" +#include "orbsvcs/Event/EC_Filter.h" #include /**/ "event_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp index 6114de4f75b..03d6f4a56b6 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "FT_ClientORBInitializer.h" -#include "FT_ClientPolicyFactory.h" -#include "FT_ClientRequest_Interceptor.h" +#include "orbsvcs/FaultTolerance/FT_ClientORBInitializer.h" +#include "orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h" +#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/Exception.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h index 0537577a9c8..c0383c99cbc 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h @@ -21,7 +21,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "FT_ClientORB_export.h" +#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp index 3b1d573830a..852e1c2c97b 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "FT_ClientPolicyFactory.h" -#include "FT_ClientPolicy_i.h" +#include "orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h" +#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h index 72433ffab41..7ee620338b9 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h @@ -31,7 +31,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "FT_ClientORB_export.h" +#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp index 20a229a0ccf..b53265cbfa5 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp @@ -1,5 +1,5 @@ //$Id$ -#include "FT_ClientPolicy_i.h" +#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h" #include "tao/debug.h" #include "ace/Log_Msg.h" @@ -7,7 +7,7 @@ #include "tao/AnyTypeCode/Any.h" #if !defined (__ACE_INLINE__) -#include "FT_ClientPolicy_i.inl" +#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(FaultTolerance, FT_ClientPolicy_i, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h index 2dd5abc2e23..a1bbf81174e 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h @@ -23,7 +23,7 @@ #endif /* _MSC_VER */ #include "tao/LocalObject.h" -#include "FT_ClientORB_export.h" +#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -157,7 +157,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -#include "FT_ClientPolicy_i.inl" +#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index 351277b62f9..ad331580af6 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "FT_ClientRequest_Interceptor.h" -#include "FT_Service_Callbacks.h" +#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h" +#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/CORBA_String.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h index 30f6dbe4128..c4115555085 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h @@ -13,7 +13,7 @@ #define TAO_FT_CLIENT_REQUEST_INTERCEPTOR_H #include /**/ "ace/pre.h" -#include "FT_ClientORB_export.h" +#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp index fd70ea58531..7adfd628330 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp @@ -1,7 +1,7 @@ -#include "FT_ClientService_Activate.h" -#include "FT_Service_Callbacks.h" -#include "FT_ClientORBInitializer.h" -#include "FT_Endpoint_Selector_Factory.h" +#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" +#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h" +#include "orbsvcs/FaultTolerance/FT_ClientORBInitializer.h" +#include "orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h" #include "tao/ORB_Core.h" #include "tao/Service_Callbacks.h" #include "tao/ORBInitializer_Registry.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h index 9aa5e0d7889..c6b8c863e6f 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h @@ -16,7 +16,7 @@ #define TAO_FT_CLIENTACTIVATE_H #include /**/ "ace/pre.h" -#include "FT_ClientORB_export.h" +#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp index adfc55d3e05..280b95cab98 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "FT_Endpoint_Selector_Factory.h" -#include "FT_Invocation_Endpoint_Selectors.h" +#include "orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h" +#include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h index a93b31b0da3..d2a6462b4e0 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "FT_ClientORB_export.h" +#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index 09a2bb56a87..413bce96aaf 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -1,4 +1,4 @@ -#include "FT_IOGR_Property.h" +#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "tao/MProfile.h" #include "tao/Profile.h" @@ -16,7 +16,7 @@ ACE_RCSID (FaultTolerance, "$Id$") #if !defined (__ACE_INLINE__) -# include "FT_IOGR_Property.inl" +# include "orbsvcs/FaultTolerance/FT_IOGR_Property.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h index 6c91f3c66d0..cc888e28e31 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h @@ -26,7 +26,7 @@ #include "tao/IORManipulation/IORManip_Loader.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/IOPC.h" -#include "FT_ORB_Utils_export.h" +#include "orbsvcs/FaultTolerance/FT_ORB_Utils_export.h" #if defined(_MSC_VER) #pragma warning(push) @@ -140,7 +140,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -# include "FT_IOGR_Property.inl" +# include "orbsvcs/FaultTolerance/FT_IOGR_Property.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp index 47891f3bba4..3243d7ea5fd 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "FT_Invocation_Endpoint_Selectors.h" +#include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h" #include "tao/Profile_Transport_Resolver.h" #include "tao/Stub.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h index 3b0f561649d..ae3a473ea34 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "FT_ClientORB_export.h" +#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp index b5fe34cb281..3e2a732dd62 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp @@ -2,10 +2,10 @@ // // $Id$ -#include "FT_ORBInitializer.h" -#include "FT_PolicyFactory.h" -#include "FT_ClientRequest_Interceptor.h" -#include "FT_ServerRequest_Interceptor.h" +#include "orbsvcs/FaultTolerance/FT_ORBInitializer.h" +#include "orbsvcs/FaultTolerance/FT_PolicyFactory.h" +#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h" +#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/Exception.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h index 69be6a9a3da..8493a77ddac 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h @@ -22,7 +22,7 @@ #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" -#include "fault_tol_export.h" +#include "orbsvcs/FaultTolerance/fault_tol_export.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp index dc0f72f1d3f..74758912067 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp @@ -2,8 +2,8 @@ // // $Id$ -#include "FT_PolicyFactory.h" -#include "FT_Policy_i.h" +#include "orbsvcs/FaultTolerance/FT_PolicyFactory.h" +#include "orbsvcs/FaultTolerance/FT_Policy_i.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h index e108bcae507..bb71603c077 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h @@ -33,7 +33,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "fault_tol_export.h" +#include "orbsvcs/FaultTolerance/fault_tol_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp index f579b080941..c24aa921d17 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp @@ -1,10 +1,10 @@ //$Id$ -#include "FT_Policy_i.h" +#include "orbsvcs/FaultTolerance/FT_Policy_i.h" #include "tao/debug.h" #if !defined (__ACE_INLINE__) -#include "FT_Policy_i.inl" +#include "orbsvcs/FaultTolerance/FT_Policy_i.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(FaultTolerance, FT_Policy_i, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h index 21a567e39ee..8fd5f3a1fc8 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h @@ -209,7 +209,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -#include "FT_Policy_i.inl" +#include "orbsvcs/FaultTolerance/FT_Policy_i.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp index 9351efc0b7c..77b99f3035a 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "FT_ServerORBInitializer.h" -#include "FT_ServerPolicyFactory.h" -#include "FT_ServerRequest_Interceptor.h" +#include "orbsvcs/FaultTolerance/FT_ServerORBInitializer.h" +#include "orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h" +#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h" #include "tao/ORB_Constants.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/Exception.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h index cf9ef903306..0e2711ed429 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h @@ -21,7 +21,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "FT_ServerORB_export.h" +#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp index 9f6c4a2230a..e1c8fcea33b 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp @@ -2,8 +2,8 @@ // // $Id$ -#include "FT_ServerPolicyFactory.h" -#include "FT_ServerPolicy_i.h" +#include "orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h" +#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h index 09a6d64d6f7..2ae22af9f48 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h @@ -31,7 +31,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "FT_ServerORB_export.h" +#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp index 4f42bde34cb..25e079b7692 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp @@ -1,12 +1,12 @@ //$Id$ -#include "FT_ServerPolicy_i.h" +#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/AnyTypeCode/Any.h" #if !defined (__ACE_INLINE__) -#include "FT_ServerPolicy_i.inl" +#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(FaultTolerance, FT_ServerPolicy_i, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h index ee54acfefae..6019cdc8f70 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h @@ -22,7 +22,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "FT_ServerORB_export.h" +#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h" #include "tao/LocalObject.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -88,7 +88,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -#include "FT_ServerPolicy_i.inl" +#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index f9d12eb4cfc..64866cc36ed 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -1,4 +1,4 @@ -#include "FT_ServerRequest_Interceptor.h" +#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h" #include "tao/IOP_IORC.h" #include "tao/ORB_Constants.h" #include "tao/AnyTypeCode/DynamicC.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h index 79421c89576..78c188d597d 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h @@ -15,7 +15,7 @@ #ifndef TAO_FT_SERVER_REQUEST_INTERCEPTOR_H #define TAO_FT_SERVER_REQUEST_INTERCEPTOR_H -#include "FT_ServerORB_export.h" +#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp index 826d4d06edb..be4448486c8 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp @@ -1,5 +1,5 @@ -#include "FT_ServerService_Activate.h" -#include "FT_ServerORBInitializer.h" +#include "orbsvcs/FaultTolerance/FT_ServerService_Activate.h" +#include "orbsvcs/FaultTolerance/FT_ServerORBInitializer.h" #include "tao/ORB_Core.h" #include "tao/Service_Callbacks.h" #include "tao/ORBInitializer_Registry.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h index df27b2c2009..7c57a64a2c2 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h @@ -16,7 +16,7 @@ #define TAO_FT_SERVERACTIVATE_H #include /**/ "ace/pre.h" -#include "FT_ServerORB_export.h" +#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp index 18c94f4bce1..9c0e8ed16a2 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp @@ -1,7 +1,7 @@ -#include "FT_Service_Activate.h" -#include "FT_Service_Callbacks.h" -#include "FT_ORBInitializer.h" -#include "FT_Endpoint_Selector_Factory.h" +#include "orbsvcs/FaultTolerance/FT_Service_Activate.h" +#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h" +#include "orbsvcs/FaultTolerance/FT_ORBInitializer.h" +#include "orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h" #include "tao/ORB_Core.h" #include "tao/Service_Callbacks.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h index 6ddf858f628..f6d261f2246 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h @@ -13,7 +13,7 @@ #ifndef TAO_FT_ACTIVATE_H #define TAO_FT_ACTIVATE_H -#include "FT_ClientService_Activate.h" -#include "FT_ServerService_Activate.h" +#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" +#include "orbsvcs/FaultTolerance/FT_ServerService_Activate.h" #endif /*TAO_FT_ACTIVATE_H*/ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index 21d8ef638d4..5676d9121e7 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "FT_Service_Callbacks.h" -#include "FT_ClientPolicy_i.h" +#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h" +#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h index 3fe34415887..8fee31df686 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h @@ -16,7 +16,7 @@ #define TAO_FT_CALLBACKS_H #include /**/ "ace/pre.h" -#include "FT_ClientORB_export.h" +#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp index 7aa93637673..e4ee1d43f28 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "FTRT_ClientORB_Initializer.h" -#include "FTRT_ClientORB_Interceptor.h" +#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h" +#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h" ACE_RCSID (ClientORB, FTRT_ClientORB_Initializer, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp index 97d221936fe..1cc5d2fd2de 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "FTRT_ClientORB_Interceptor.h" +#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h" #include "tao/MProfile.h" #include "tao/Stub.h" #include "tao/CDR.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp index 5ba0e9defeb..adac1b323a4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "FTRT_ClientORB_Loader.h" +#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" -#include "FTRT_ClientORB_Initializer.h" +#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h index b6bf1114663..e66f632a2e8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "ftrt_clientorb_export.h" +#include "orbsvcs/FtRtEvent/ClientORB/ftrt_clientorb_export.h" #include "tao/orbconf.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp index 3c2c6a027e6..c28c22e6b32 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "AMI_Primary_Replication_Strategy.h" +#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h" #include "ace/Synch_T.h" -#include "GroupInfoPublisher.h" -#include "Request_Context_Repository.h" -#include "create_persistent_poa.h" -#include "Update_Manager.h" +#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" +#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" +#include "orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h" +#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h" #include "tao/Utils/PolicyList_Destroyer.h" -#include "ObjectGroupManagerHandler.h" +#include "orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h" #include "tao/Utils/Implicit_Deactivator.h" #include "../Utils/resolve_init.h" #include "../Utils/ScopeGuard.h" 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 eae8337d4b1..24d44799505 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h @@ -13,8 +13,8 @@ #ifndef AMI_PRIMARY_REPLICATION_STRATEGY_H #define AMI_PRIMARY_REPLICATION_STRATEGY_H -#include "UpdateableHandler.h" -#include "Replication_Strategy.h" +#include "orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h" +#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h" #include "orbsvcs/FtRtecEventChannelAdminC.h" #include "ace/Task.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp index 9e0df5cb9c4..b4073479419 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "AMI_Replication_Strategy.h" -#include "AMI_Primary_Replication_Strategy.h" +#include "orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h" +#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h index 89727a60a40..8c25f96305d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h @@ -13,7 +13,7 @@ #ifndef AMI_REPLICATION_STRATEGY_H #define AMI_REPLICATION_STRATEGY_H -#include "Replication_Strategy.h" +#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp index 20c451ead09..50a4a5f4dff 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Basic_Replication_Strategy.h" -#include "GroupInfoPublisher.h" -#include "FTEC_Event_Channel.h" -#include "Request_Context_Repository.h" +#include "orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h" +#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" +#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" #include "../Utils/Log.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h index 4ef8582aff9..50b18dd95ee 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h @@ -11,7 +11,7 @@ //============================================================================= #ifndef BASIC_REPLICATION_STRATEGY_H #define BASIC_REPLICATION_STRATEGY_H -#include "Replication_Strategy.h" +#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h" #include "ace/Synch.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h index 2e783eeaccb..37a7597914d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h @@ -42,7 +42,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#include "FTEC_Group_Manager.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -64,7 +64,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ConnectionHandler_T.cpp" +#include "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp index adaf011b0b4..264de9de473 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Dynamic_Bitset.h" +#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h" #include <assert.h> #include <algorithm> #if !defined (__ACE_INLINE__) -#include "Dynamic_Bitset.inl" +#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl" #endif /* __ACE_INLINE__ */ inline unsigned ceil(unsigned numerator, unsigned denominator) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h index 360ccfc02c5..c4da90b00af 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h @@ -70,7 +70,7 @@ Dynamic_Bitset operator & (const Dynamic_Bitset& lhs, const Dynamic_Bitset& rhs) TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Dynamic_Bitset.inl" +#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl" #endif /* __ACE_INLINE__ */ #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp index b072a2653fd..7f567ab80bb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "FTEC_Become_Primary_Listener.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h index 8d1a7232e54..c2a056e29dc 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h @@ -13,7 +13,7 @@ #ifndef TAO_FTEC_BECOME_PRIMARY_LISTENER_H #define TAO_FTEC_BECOME_PRIMARY_LISTENER_H -#include "ftrtec_export.h" +#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h" #include "tao/Versioned_Namespace.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp index 2117d7e4bcb..14ec7a5c533 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -2,9 +2,9 @@ #include "orbsvcs/Event/EC_ProxyConsumer.h" #include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "FTEC_ConsumerAdmin.h" -#include "FTEC_ProxySupplier.h" -#include "ProxySupplierStateWorker.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h" +#include "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h" ACE_RCSID (EventChannel, TAO_FTEC_ConsumerAdmin, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h index ff28bdb222e..042172fc555 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h @@ -18,8 +18,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/Event/EC_ConsumerAdmin.h" -#include "FT_ProxyAdmin_T.h" -#include "ProxySupplierStateWorker.h" +#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h" +#include "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index fd7123d8617..755926f2f30 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -1,19 +1,19 @@ // $Id$ #include "ace/Dynamic_Service.h" -#include "FTEC_Event_Channel.h" -#include "FTEC_Event_Channel_Impl.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h" #include "../Utils/activate_with_id.h" #include "../Utils/resolve_init.h" #include "../Utils/UUID.h" -#include "Fault_Detector_Loader.h" -#include "Fault_Detector.h" -#include "Request_Context_Repository.h" -#include "Replication_Service.h" -#include "Identification_Service.h" -#include "create_persistent_poa.h" +#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h" +#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h" +#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" +#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" +#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h" +#include "orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h" #include "tao/Utils/PolicyList_Destroyer.h" -#include "GroupInfoPublisher.h" +#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" ACE_RCSID (EventChannel, TAO_FTEC_Event_Channel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h index 3daf68143e0..397aa0af43e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h @@ -12,7 +12,7 @@ #ifndef FTEC_EVENT_CHANNEL_H #define FTEC_EVENT_CHANNEL_H -#include "ftrtec_export.h" +#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h" #include "orbsvcs/FtRtecEventChannelAdminS.h" #if !defined (ACE_LACKS_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 70398c48662..0d85bbe8155 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "FTEC_Event_Channel_Impl.h" -#include "FTEC_Factory.h" -#include "FTEC_SupplierAdmin.h" -#include "FTEC_ConsumerAdmin.h" -#include "FTEC_ProxyConsumer.h" -#include "FTEC_ProxySupplier.h" -#include "FtEventServiceInterceptor.h" -#include "FT_ProxyAdmin_Base.h" -#include "IOGR_Maker.h" -#include "Replication_Service.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h" +#include "orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h" +#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h" +#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" +#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" #include "../Utils/Safe_InputCDR.h" #include "orbsvcs/FtRtecEventCommC.h" 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 55bca7d95f3..ba6c2e1bc0d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h @@ -15,9 +15,9 @@ #include "ace/Synch_T.h" #include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "FTEC_Factory.h" -#include "FTEC_Group_Manager.h" -#include "IOGR_Maker.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h" +#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp index 4fe0ad267cf..c0bb7566afa 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp @@ -1,11 +1,11 @@ // $Id$ #include "orbsvcs/Event/EC_Event_Channel.h" -#include "FTEC_Event_Channel.h" -#include "FTEC_Factory.h" -#include "FTEC_ProxySupplier.h" -#include "FTEC_ProxyConsumer.h" -#include "FTEC_SupplierAdmin.h" -#include "FTEC_ConsumerAdmin.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h" ACE_RCSID (EventChannel, FTEC_Factory, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp index d690bb1a1c8..80c7ba30a06 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "FTEC_Group_Manager.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h" #include "ace/Synch_T.h" -#include "Replication_Service.h" -#include "Fault_Detector.h" -#include "IOGR_Maker.h" -#include "GroupInfoPublisher.h" -#include "Replication_Service.h" +#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" +#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h" +#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" +#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" +#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" #include "../Utils/Log.h" #include "tao/CDR.h" #include "orbsvcs/PortableGroup/PG_Operators.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h index 7d13567b453..0d06c156bf5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h @@ -14,7 +14,7 @@ #define TAO_FTEC_GROUP_MANAGER_H #include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "FTEC_Fault_Listener.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp index 2a80623f0df..410377e8a80 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "FTEC_ORBInitializer.h" -#include "Set_Update_Interceptor.h" -#include "ForwardCtrlServerInterceptor.h" -#include "FtEventServiceInterceptor.h" -#include "Request_Context_Repository.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h" +#include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h" +#include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h" +#include "orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h" +#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" ACE_RCSID (EventChannel, FTEC_ORBInitializer, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp index 1fb4a4372bd..3f489f9540f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "FTEC_ProxyConsumer.h" -#include "Request_Context_Repository.h" -#include "Replication_Service.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h" +#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" +#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" #include "../Utils/activate_with_id.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h index 252764ccda9..518e4f73eb0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h @@ -15,7 +15,7 @@ #include "orbsvcs/Event/EC_Default_ProxyConsumer.h" #include "ace/SString.h" #include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "Request_Context_Repository.h" +#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp index 6c2b8e2adf9..62fad4ef9d7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "FTEC_ProxySupplier.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h" #include "../Utils/activate_with_id.h" -#include "Request_Context_Repository.h" -#include "Replication_Service.h" +#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" +#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" ACE_RCSID (EventChannel, TAO_FTEC_ProxyPushSupplier, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h index 7044d86f3bd..34c38f96400 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h @@ -15,7 +15,7 @@ #include "orbsvcs/Event/EC_Default_ProxySupplier.h" #include "ace/SString.h" #include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "Request_Context_Repository.h" +#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp index e7bdb404bd0..74a666746cc 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp @@ -2,8 +2,8 @@ #include "orbsvcs/Event/EC_ProxySupplier.h" #include "orbsvcs/Event/EC_Event_Channel_Base.h" -#include "FTEC_SupplierAdmin.h" -#include "FTEC_ProxyConsumer.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h" #include "tao/Stub.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h index b1aed896d8b..814061c0263 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h @@ -14,9 +14,9 @@ #define TAO_FTEC_SUPPLIERADMIN_H #include /**/ "ace/pre.h" -#include "FTEC_ProxyConsumer.h" -#include "FT_ProxyAdmin_T.h" -#include "ProxyConsumerStateWorker.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h" +#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h" +#include "orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h index d0988b09021..9666d6e5480 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h @@ -3,9 +3,9 @@ #ifndef FTRTEC_SERVICE_ACTIVATE_H #define FTRTEC_SERVICE_ACTIVATE_H -#include "Fault_Detector_Loader.h" -#include "Identification_Service.h" -#include "Replication_Service.h" +#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h" +#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h" +#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp index c055791b4ef..5fb7d08ad06 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "FT_ProxyAdmin_Base.h" +#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h" #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/Servant_Base.h" #include "tao/PortableServer/PortableServer.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp index cd0fca06abd..00c658cef95 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "IOGR_Maker.h" -#include "Replication_Service.h" +#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" +#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" #include "ace/Synch_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h index 59fe4d40261..92e2bf0ad6d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h @@ -12,9 +12,9 @@ #ifndef FT_PROXYADMIN_H #define FT_PROXYADMIN_H -#include "FT_ProxyAdmin_Base.h" +#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h" #include "../Utils/ScopeGuard.h" -#include "Request_Context_Repository.h" +#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -48,7 +48,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "FT_ProxyAdmin_T.cpp" +#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp index 33aff57f712..a7cc3c7a391 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Reactor.h" -#include "Fault_Detector.h" +#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h" #include "ace/Select_Reactor.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp index 81333095e8d..56d8c25b846 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "Fault_Detector_Loader.h" -#include "Fault_Detector_T.h" -#include "FTEC_Fault_Listener.h" -#include "SCTP_Fault_Detector.h" +#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h" +#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h" +#include "orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" -#include "ConnectionHandler_T.h" +#include "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h" #include "ace/Acceptor.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h index 5b59e39808e..dbe29fe82da 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "ftrtec_export.h" +#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h" #include "tao/orbconf.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h index 2d49e5be16c..45be158a522 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h @@ -13,7 +13,7 @@ #ifndef FAULT_DETECTOR_T_H #define FAULT_DETECTOR_T_H -#include "Fault_Detector.h" +#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -38,7 +38,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Fault_Detector_T.cpp" +#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index 5223bf12706..ee750df8f22 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "ForwardCtrlServerInterceptor.h" -#include "GroupInfoPublisher.h" -#include "IOGR_Maker.h" +#include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h" +#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" +#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" #include "tao/PortableServer/PortableServer.h" #include "../Utils/resolve_init.h" #include "../Utils/Safe_InputCDR.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index ee81eb94ce2..779396ce1ee 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -2,8 +2,8 @@ #include "ace/OS_NS_string.h" #include "ace/SString.h" #include "orbsvcs/FT_CORBA_ORBC.h" -#include "FtEventServiceInterceptor.h" -#include "Request_Context_Repository.h" +#include "orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h" +#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" #include "../Utils/Safe_InputCDR.h" #include "../Utils/Log.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index 47f6ef5b05e..63d7801689e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "GroupInfoPublisher.h" +#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" #include "../Utils/resolve_init.h" -#include "IOGR_Maker.h" -#include "Identification_Service.h" -#include "FTEC_Become_Primary_Listener.h" +#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" +#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h" #include "../Utils/Log.h" //#include "../Utils/log_obj_endpoints.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index 159c3333b7b..7f72a686a8f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "IOGR_Maker.h" +#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" #include "tao/MProfile.h" #include "tao/Profile.h" #include "tao/Stub.h" @@ -10,7 +10,7 @@ #include "../Utils/resolve_init.h" #include "../Utils/Safe_InputCDR.h" #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" -#include "GroupInfoPublisher.h" +#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" ACE_RCSID (EventChannel, IOGR_Maker, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp index 1cef2d12730..7b356e36f4d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Identification_Service.h" +#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h" #include "../Utils/UUID.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h index 69ecd289842..a932c92b789 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h @@ -17,7 +17,7 @@ #include "orbsvcs/CosNamingC.h" #include "orbsvcs/FTRTC.h" #include "orbsvcs/FtRtecEventCommC.h" -#include "ftrtec_export.h" +#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp index 0f9f2f1e0ae..fbb8c4166a4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp @@ -1,5 +1,5 @@ // $Id$ -#include "ObjectGroupManagerHandler.h" +#include "orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp index 6b325b03457..8708b6a33d7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ProxyConsumerStateWorker.h" +#include "orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h" #include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "orbsvcs/Event/EC_ProxySupplier.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h index bb0a317b06a..1610cd90ef1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h @@ -15,7 +15,7 @@ #include "orbsvcs/Event/EC_SupplierAdmin.h" #include "orbsvcs/ESF/ESF_Worker.h" -#include "FTEC_ProxyConsumer.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp index 72fa8a0a8d3..5618c2d373f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp @@ -1,7 +1,7 @@ // $Id$ #include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "ProxySupplierStateWorker.h" +#include "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h" #include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "orbsvcs/Event/EC_ProxyConsumer.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h index f8ff8d7a686..cf9516d100d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h @@ -15,7 +15,7 @@ #include "orbsvcs/Event/EC_ConsumerAdmin.h" #include "orbsvcs/ESF/ESF_Worker.h" -#include "FTEC_ProxySupplier.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp index 53afcb41109..753cd359248 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Replication_Service.h" -#include "AMI_Replication_Strategy.h" -#include "Basic_Replication_Strategy.h" -#include "FTEC_ORBInitializer.h" +#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" +#include "orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h" +#include "orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h" #include "../Utils/Log.h" #include "tao/ORBInitializer_Registry.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h index 43ba12d9fcc..e1deca2f103 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h @@ -14,10 +14,10 @@ #define REPLCATION_SERVICE_H #include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "FTEC_Become_Primary_Listener.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h" #include "tao/PortableInterceptorC.h" #include "ace/Service_Object.h" -#include "ftrtec_export.h" +#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp index 11064ad2154..f7cc5f524f7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Replication_Strategy.h" -#include "FTEC_Event_Channel.h" +#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" ACE_RCSID (EventChannel, Replication_Strategy, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index 882ed76ea19..f04af729152 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Request_Context_Repository.h" +#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" #include "../Utils/resolve_init.h" #include "../Utils/UUID.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp index 12d07ff4475..222d5daa3fb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "SCTP_Fault_Detector.h" +#include "orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h" #if (TAO_HAS_SCIOP == 1) -#include "FTEC_Fault_Listener.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_sys_socket.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h index 7be6c844a88..4e9978afa7f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h @@ -26,8 +26,8 @@ #include "ace/SOCK_SEQPACK_Acceptor.h" #include "ace/SOCK_SEQPACK_Connector.h" #include "ace/Multihomed_INET_Addr.h" -#include "ConnectionHandler_T.h" -#include "Fault_Detector_T.h" +#include "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h" +#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # 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 24e9ab694f8..58e96befd06 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -1,9 +1,9 @@ // $Id$ #include "tao/CDR.h" -#include "Set_Update_Interceptor.h" +#include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h" #include "orbsvcs/FTRTC.h" -#include "Request_Context_Repository.h" +#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h" ACE_RCSID (EventChannel, Set_Update_Intercetpor, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp index 206abdc8168..c207baefd16 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Update_Manager.h" +#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h" ACE_RCSID (EventChannel, Update_Manager, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h index aa5cf422867..caacd63fffe 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h @@ -14,7 +14,7 @@ #define UPDATE_MANAGER_H #include "ace/Synch_T.h" -#include "Dynamic_Bitset.h" +#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index 3e01eda861f..fadeb16f0e0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "UpdateableHandler.h" -#include "Update_Manager.h" -#include "AMI_Primary_Replication_Strategy.h" +#include "orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h" +#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h" +#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h" #include "../Utils/resolve_init.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp index 21452bb75ec..fe5cd5dbe41 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "create_persistent_poa.h" +#include "orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h" ACE_RCSID (EventChannel, create_persistent_poa, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index 3de9bcaee9f..afbbaf3d051 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -1,7 +1,7 @@ -#include "FTEC_Gateway.h" -#include "activate_with_id.h" -#include "UUID.h" -#include "resolve_init.h" +#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" +#include "orbsvcs/FtRtEvent/Utils/activate_with_id.h" +#include "orbsvcs/FtRtEvent/Utils/UUID.h" +#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" #include "orbsvcs/FtRtecEventCommS.h" #include "tao/ORB_Core.h" @@ -10,7 +10,7 @@ ACE_RCSID (Utils, "$Id$") #if !defined(__ACE_INLINE__) -#include "FTEC_Gateway.inl" +#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h index af72ff4118e..3db7660c7ad 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h @@ -75,7 +75,7 @@ namespace TAO_FTRTEC TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "FTEC_Gateway.inl" +#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp index c691b427009..6319f696946 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp @@ -1,8 +1,8 @@ //$Id$ -#include "Log.h" +#include "orbsvcs/FtRtEvent/Utils/Log.h" #if !defined(__ACE_INLINE__) -#include "Log.inl" +#include "orbsvcs/FtRtEvent/Utils/Log.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h index 2897fdc083c..71b95a8a28e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h @@ -13,7 +13,7 @@ #define FTRTEC_LOG_H #include /**/ "ace/pre.h" -#include "ftrtevent_export.h" +#include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h" #include "tao/Versioned_Namespace.h" #include "ace/OS.h" #include "ace/Log_Msg.h" @@ -41,7 +41,7 @@ namespace TAO_FTRTEC { TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "Log.inl" +#include "orbsvcs/FtRtEvent/Utils/Log.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp index b15359f97be..96f0abfbad5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp @@ -1,9 +1,9 @@ -#include "Safe_InputCDR.h" +#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h" ACE_RCSID (Utils, Safe_InputCDR, "$Id$") #if !defined(__ACE_INLINE__) -#include "Safe_InputCDR.inl" +#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h index e2c7ade549a..b4aede7f570 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h @@ -12,7 +12,7 @@ #define SAFE_INPUTCDR_H #include /**/ "ace/pre.h" -#include "ftrtevent_export.h" +#include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h" #include "tao/CDR.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -33,7 +33,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "Safe_InputCDR.inl" +#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp index c97e70b407e..6a34e95164b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp @@ -1,11 +1,11 @@ //$Id$ -#include "UUID.h" +#include "orbsvcs/FtRtEvent/Utils/UUID.h" ACE_RCSID (Utils, UUID, "$Id$") #if !defined(__ACE_INLINE__) -#include "UUID.inl" +#include "orbsvcs/FtRtEvent/Utils/UUID.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h index 0d7af19d246..19b81c44354 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h @@ -12,7 +12,7 @@ #define UUID_H #include /**/ "ace/pre.h" -#include "ftrtevent_export.h" +#include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h" #include "tao/Versioned_Namespace.h" #include "ace/OS.h" #include "ace/SString.h" @@ -116,7 +116,7 @@ class TAO_FtRtEvent_Export UUID TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "UUID.inl" +#include "orbsvcs/FtRtEvent/Utils/UUID.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index a9a5b5e0022..6d1876bd9dd 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -1,8 +1,8 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -#include "HTIOP_Acceptor.h" -#include "HTIOP_Profile.h" +#include "orbsvcs/HTIOP/HTIOP_Acceptor.h" +#include "orbsvcs/HTIOP/HTIOP_Profile.h" #include "ace/HTBP/HTBP_Environment.h" #include "ace/HTBP/HTBP_ID_Requestor.h" @@ -16,7 +16,7 @@ #include "ace/Auto_Ptr.h" #if !defined(__ACE_INLINE__) -#include "HTIOP_Acceptor.i" +#include "orbsvcs/HTIOP/HTIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(HTIOP, diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h index 5e2f19a4954..6abbb6f23e9 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h @@ -18,8 +18,8 @@ #define HTIOP_ACCEPTOR_H #include /**/ "ace/pre.h" -#include "HTIOP_Completion_Handler.h" -#include "HTIOP_Connection_Handler.h" +#include "orbsvcs/HTIOP/HTIOP_Completion_Handler.h" +#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -232,7 +232,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "HTIOP_Acceptor.i" +#include "orbsvcs/HTIOP/HTIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp index a971a420324..f990f16ce1b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp @@ -3,8 +3,8 @@ #ifndef HTIOP_ACCEPTOR_IMPL_CPP #define HTIOP_ACCEPTOR_IMPL_CPP -#include "HTIOP_Acceptor_Impl.h" -#include "HTIOP_Completion_Handler.h" +#include "orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h" +#include "orbsvcs/HTIOP/HTIOP_Completion_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp index f50d5fb2ff7..de9b6a14cd2 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "HTIOP_Completion_Handler.h" +#include "orbsvcs/HTIOP/HTIOP_Completion_Handler.h" -#include "HTIOP_Transport.h" -#include "HTIOP_Endpoint.h" +#include "orbsvcs/HTIOP/HTIOP_Transport.h" +#include "orbsvcs/HTIOP/HTIOP_Endpoint.h" #include "ace/HTBP/HTBP_Stream.h" #include "ace/HTBP/HTBP_Session.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h index 31cbf4c043f..63ba0a96b34 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h @@ -24,8 +24,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "HTIOP_Export.h" -#include "HTIOP_Connection_Handler.h" +#include "orbsvcs/HTIOP/HTIOP_Export.h" +#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index 8962633cda2..00a99a84351 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "HTIOP_Connection_Handler.h" +#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h" -#include "HTIOP_Transport.h" -#include "HTIOP_Endpoint.h" +#include "orbsvcs/HTIOP/HTIOP_Transport.h" +#include "orbsvcs/HTIOP/HTIOP_Endpoint.h" #include "ace/HTBP/HTBP_Stream.h" #include "ace/HTBP/HTBP_Session.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h index 7c889f6a1dd..2651dafebd0 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h @@ -14,7 +14,7 @@ #define HTIOP_CONNECTION_HANDLER_H #include /**/ "ace/pre.h" -#include "HTIOP_Transport.h" +#include "orbsvcs/HTIOP/HTIOP_Transport.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index d0acebb16c9..f9dba06ca70 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "HTIOP_Connector.h" -#include "HTIOP_Profile.h" +#include "orbsvcs/HTIOP/HTIOP_Connector.h" +#include "orbsvcs/HTIOP/HTIOP_Profile.h" #include "ace/HTBP/HTBP_Session.h" #include "ace/HTBP/HTBP_ID_Requestor.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h index 6dd450676ef..62e06d6a988 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "HTIOP_Connection_Handler.h" +#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h" #include "tao/Transport_Connector.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp index ef4bc8612cd..8c891ddaf38 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp @@ -3,7 +3,7 @@ #ifndef HTIOP_CONNECTOR_IMPL_CPP #define HTIOP_CONNECTOR_IMPL_CPP -#include "HTIOP_Connector_Impl.h" +#include "orbsvcs/HTIOP/HTIOP_Connector_Impl.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h index 2532e88ff3f..0a3e6b4992d 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h @@ -14,7 +14,7 @@ #define HTIOP_CONNECTOR_IMPL_H #include /**/ "ace/pre.h" -#include "HTIOP_Export.h" +#include "orbsvcs/HTIOP/HTIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp index 4c3cbc61c1b..2d3e6da6299 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "HTIOP_Endpoint.h" -#include "HTIOP_Profile.h" +#include "orbsvcs/HTIOP/HTIOP_Endpoint.h" +#include "orbsvcs/HTIOP/HTIOP_Profile.h" #include "ace/os_include/os_netdb.h" #include "ace/Log_Msg.h" @@ -15,7 +15,7 @@ ACE_RCSID (HTIOP, "$Id$") #if !defined (__ACE_INLINE__) -# include "HTIOP_Endpoint.i" +# include "orbsvcs/HTIOP/HTIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h index aee4075cff9..2fa800fd7a4 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h @@ -17,7 +17,7 @@ #define HTIOP_ENDPOINT_H #include /**/ "ace/pre.h" -#include "HTIOP_Export.h" +#include "orbsvcs/HTIOP/HTIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -155,7 +155,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "HTIOP_Endpoint.i" +# include "orbsvcs/HTIOP/HTIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp index e510a9d0ebf..8542907269b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "HTIOP_Factory.h" -#include "HTIOP_Acceptor.h" -#include "HTIOP_Connector.h" -#include "HTIOP_Profile.h" +#include "orbsvcs/HTIOP/HTIOP_Factory.h" +#include "orbsvcs/HTIOP/HTIOP_Acceptor.h" +#include "orbsvcs/HTIOP/HTIOP_Connector.h" +#include "orbsvcs/HTIOP/HTIOP_Profile.h" #include "ace/HTBP/HTBP_Environment.h" #include "tao/IOPC.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h index 52c6e098da8..276d0f1199e 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h @@ -15,7 +15,7 @@ #define HTIOP_FACTORY_H #include /**/ "ace/pre.h" -#include "HTIOP_Export.h" +#include "orbsvcs/HTIOP/HTIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index 83c81890696..63d4a82db22 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -1,8 +1,8 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -#include "HTIOP_Profile.h" -#include "htiop_endpointsC.h" +#include "orbsvcs/HTIOP/HTIOP_Profile.h" +#include "orbsvcs/HTIOP/htiop_endpointsC.h" #include "ace/os_include/os_netdb.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h index 6405145adfa..938666a6bfc 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h @@ -24,7 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Object_KeyC.h" -#include "HTIOP_Endpoint.h" +#include "orbsvcs/HTIOP/HTIOP_Endpoint.h" #include "ace/Synch.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp index 47bdf0bcf06..69d44dbb9e4 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "HTIOP_Transport.h" +#include "orbsvcs/HTIOP/HTIOP_Transport.h" -#include "HTIOP_Connection_Handler.h" -#include "HTIOP_Acceptor.h" -#include "HTIOP_Profile.h" +#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h" +#include "orbsvcs/HTIOP/HTIOP_Acceptor.h" +#include "orbsvcs/HTIOP/HTIOP_Profile.h" #include "ace/HTBP/HTBP_Session.h" #include "tao/Acceptor_Registry.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h index c17aefcfad8..6db9ca8dcfc 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h @@ -15,7 +15,7 @@ #define TAO_HTIOP_TRANSPORT_H #include /**/ "ace/pre.h" -#include "HTIOP_Export.h" +#include "orbsvcs/HTIOP/HTIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp index 6a4f8475997..e55949ffb19 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp @@ -36,7 +36,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "htiop_endpointsC.h" +#include "orbsvcs/HTIOP/htiop_endpointsC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h index 03f874b5f53..b1345d3a161 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "HTIOP_Export.h" +#include "orbsvcs/HTIOP/HTIOP_Export.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Sequence_T.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp index 791e3b79954..9c7831e7387 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "AbstractInterfaceDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/AbstractInterfaceDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" ACE_RCSID (IFRService, AbstractInterfaceDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h index ce2ab4dcbdb..b753a1afa16 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_ABSTRACTINTERFACEDEF_I_H #define TAO_ABSTRACTINTERFACEDEF_I_H -#include "InterfaceDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/InterfaceDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp index 1c4e8b5d987..308a637d9ac 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "AliasDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/AliasDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h index c8e0f2fffb4..7cc9c8826ca 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_ALIASDEF_I_H #define TAO_ALIASDEF_I_H -#include "TypedefDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp index 1c0a53c240d..70022598977 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "ArrayDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/ArrayDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h index ee024d06a9f..ec0d6966f8d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_ARRAYDEF_I_H #define TAO_ARRAYDEF_I_H -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp index 1027d8f5928..0d9ce3b6a42 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "AttributeDef_i.h" -#include "Repository_i.h" -#include "IDLType_i.h" -#include "ExceptionDef_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/AttributeDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ExceptionDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h index 2c3883e7906..d08b3dfa119 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_ATTRIBUTEDEF_I_H #define TAO_ATTRIBUTEDEF_I_H -#include "Contained_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp index 918723c6417..b61cc8542a9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "ComponentContainer_i.h" -#include "Repository_i.h" -#include "InterfaceDef_i.h" -#include "ComponentDef_i.h" -#include "ValueDef_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/ComponentContainer_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/InterfaceDef_i.h" +#include "orbsvcs/IFRService/ComponentDef_i.h" +#include "orbsvcs/IFRService/ValueDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" ACE_RCSID (IFRService, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h index f656d9ea391..bc1c9e9fec6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h @@ -21,14 +21,14 @@ #ifndef TAO_COMPONENTCONTAINER_I_H #define TAO_COMPONENTCONTAINER_I_H -#include "Container_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Container_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IFR_ComponentsS.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp index 2ba6e45a7fa..52d3fcd60fd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "Repository_i.h" -#include "ComponentDef_i.h" -#include "ProvidesDef_i.h" -#include "UsesDef_i.h" -#include "EmitsDef_i.h" -#include "PublishesDef_i.h" -#include "ConsumesDef_i.h" -#include "ExtAttributeDef_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ComponentDef_i.h" +#include "orbsvcs/IFRService/ProvidesDef_i.h" +#include "orbsvcs/IFRService/UsesDef_i.h" +#include "orbsvcs/IFRService/EmitsDef_i.h" +#include "orbsvcs/IFRService/PublishesDef_i.h" +#include "orbsvcs/IFRService/ConsumesDef_i.h" +#include "orbsvcs/IFRService/ExtAttributeDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h index 4db2f4b69dc..0c05918d563 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h @@ -21,15 +21,15 @@ #ifndef TAO_COMPONENTDEF_I_H #define TAO_COMPONENTDEF_I_H -#include "ExtInterfaceDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ExtInterfaceDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IFR_ComponentsS.h" -#include "IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp index 6a0a56173b4..474f85baf57 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ComponentModuleDef_i.h" +#include "orbsvcs/IFRService/ComponentModuleDef_i.h" ACE_RCSID (IFRService, ComponentModuleDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h index ba0d9850e22..6556910861c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_COMPONENTMODULEDEF_I_H #define TAO_COMPONENTMODULEDEF_I_H -#include "ComponentContainer_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ComponentContainer_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp index 8fafb46de7e..f0efb71adb1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp @@ -1,18 +1,18 @@ /* -*- C++ -*- */ // $Id$ -#include "ComponentRepository_i.h" -#include "ModuleDef_i.h" -#include "ComponentDef_i.h" -#include "HomeDef_i.h" -#include "EventDef_i.h" -#include "FinderDef_i.h" -#include "FactoryDef_i.h" -#include "EmitsDef_i.h" -#include "PublishesDef_i.h" -#include "ConsumesDef_i.h" -#include "ProvidesDef_i.h" -#include "UsesDef_i.h" +#include "orbsvcs/IFRService/ComponentRepository_i.h" +#include "orbsvcs/IFRService/ModuleDef_i.h" +#include "orbsvcs/IFRService/ComponentDef_i.h" +#include "orbsvcs/IFRService/HomeDef_i.h" +#include "orbsvcs/IFRService/EventDef_i.h" +#include "orbsvcs/IFRService/FinderDef_i.h" +#include "orbsvcs/IFRService/FactoryDef_i.h" +#include "orbsvcs/IFRService/EmitsDef_i.h" +#include "orbsvcs/IFRService/PublishesDef_i.h" +#include "orbsvcs/IFRService/ConsumesDef_i.h" +#include "orbsvcs/IFRService/ProvidesDef_i.h" +#include "orbsvcs/IFRService/UsesDef_i.h" ACE_RCSID (IFRService, ComponentRepository_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h index d6c2a404395..7690ee20edc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h @@ -21,14 +21,14 @@ #ifndef TAO_COMPONENTREPOSITORY_I_H #define TAO_COMPONENTREPOSITORY_I_H -#include "Repository_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ComponentContainer_i.h" +#include "orbsvcs/IFRService/ComponentContainer_i.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp index 3e5a832a1f4..3ca04650d04 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "ConstantDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" -#include "IDLType_i.h" +#include "orbsvcs/IFRService/ConstantDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IDLType_i.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h index a3b0b2b29fa..f9243f6d58c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_CONSTANTDEF_I_H #define TAO_CONSTANTDEF_I_H -#include "Contained_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp index e7a77458e5a..0b6b8311b7e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp @@ -2,8 +2,8 @@ // $Id$ -#include "Repository_i.h" -#include "ConsumesDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ConsumesDef_i.h" ACE_RCSID (IFRService, ConsumesDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h index 231ed6f2f84..2bbbef43916 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_CONSUMESDEF_I_H #define TAO_CONSUMESDEF_I_H -#include "EventPortDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/EventPortDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp index 4ca4a05623a..b61b34ea4a1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "concrete_classes.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/concrete_classes.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h index ddc84da8c21..5729837ce3b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h @@ -21,8 +21,8 @@ #ifndef TAO_CONTAINED_I_H #define TAO_CONTAINED_I_H -#include "IRObject_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IRObject_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp index e4a1a265e26..a4c5a74089d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Repository_i.h" -#include "InterfaceDef_i.h" -#include "ValueDef_i.h" -#include "ExtValueDef_i.h" -#include "IFR_Service_Utils.h" -#include "IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/InterfaceDef_i.h" +#include "orbsvcs/IFRService/ValueDef_i.h" +#include "orbsvcs/IFRService/ExtValueDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" #include "tao/IFR_Client/IFR_ComponentsC.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h index 54fffd17de3..ab8e833579b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h @@ -21,8 +21,8 @@ #ifndef TAO_CONTAINER_I_H #define TAO_CONTAINER_I_H -#include "IRObject_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IRObject_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp index 2232fcd228d..0cbe4a4093d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "EmitsDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/EmitsDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" ACE_RCSID (IFRService, EmitsDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h index 1537eb6b433..5d8e93fdeba 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_EMITSDEF_I_H #define TAO_EMITSDEF_I_H -#include "EventPortDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/EventPortDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp index e3ff2992e2c..4ab27a971b8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "EnumDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/EnumDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h index ce90039c409..0bd5b265451 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_ENUMDEF_I_H #define TAO_ENUMDEF_I_H -#include "TypedefDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp index c0311732717..cd62666f25d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "EventDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/EventDef_i.h" ACE_RCSID (IFRService, EventDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h index 95210c872d9..a1e280a2882 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_EVENTDEF_I_H #define TAO_EVENTDEF_I_H -#include "ExtValueDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ExtValueDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp index ce3be7d690c..f3d1a44a8f4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "Repository_i.h" -#include "EventPortDef_i.h" -#include "EventDef_i.h" -#include "IFR_Service_Utils_T.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/EventPortDef_i.h" +#include "orbsvcs/IFRService/EventDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h index 93e7ff394c3..dc84527d41f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h @@ -21,14 +21,14 @@ #ifndef TAO_EVENTPORTDEF_I_H #define TAO_EVENTPORTDEF_I_H -#include "Contained_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IFR_ComponentsS.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp index 53e2849200a..33b7c9eee99 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "ExceptionDef_i.h" -#include "Repository_i.h" -#include "IDLType_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/ExceptionDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h index ca6864b1612..88dd3e8bbd5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h @@ -21,9 +21,9 @@ #ifndef TAO_EXCEPTIONDEF_I_H #define TAO_EXCEPTIONDEF_I_H -#include "Contained_i.h" -#include "Container_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/Container_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp index 18e2d85ca02..82ffce83d05 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ExtAbstractInterfaceDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" ACE_RCSID (IFRService, ExtAbstractInterfaceDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h index 467a1509877..e79471d8e11 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h @@ -21,14 +21,14 @@ #ifndef TAO_EXTABSTRACTINTERFACEDEF_I_H #define TAO_EXTABSTRACTINTERFACEDEF_I_H -#include "AbstractInterfaceDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/AbstractInterfaceDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "InterfaceAttrExtension_i.h" +#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp index a3de999bf4f..62405fe8393 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "ExtAttributeDef_i.h" -#include "Repository_i.h" -#include "ExceptionDef_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/ExtAttributeDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ExceptionDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h index 83f1f6e3b98..f4d9e54b665 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_EXTATTRIBUTEDEF_I_H #define TAO_EXTATTRIBUTEDEF_I_H -#include "AttributeDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/AttributeDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp index f104cf7ff60..30f003136b2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ExtInterfaceDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/ExtInterfaceDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" ACE_RCSID (IFRService, ExtInterfaceDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h index 43d33ffc3a3..11fecc1e6a5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h @@ -21,14 +21,14 @@ #ifndef TAO_EXTINTERFACEDEF_I_H #define TAO_EXTINTERFACEDEF_I_H -#include "InterfaceDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/InterfaceDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "InterfaceAttrExtension_i.h" +#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp index d542a8d858f..3b802bcb762 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ExtLocalInterfaceDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" ACE_RCSID (IFRService, ExtLocalInterfaceDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h index d1c0c19e632..1e5eec3bcf2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h @@ -21,14 +21,14 @@ #ifndef TAO_EXTLOCALINTERFACEDEF_I_H #define TAO_EXTLOCALINTERFACEDEF_I_H -#include "LocalInterfaceDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/LocalInterfaceDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "InterfaceAttrExtension_i.h" +#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp index e108597159d..c70696ecf52 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "Repository_i.h" -#include "ExtValueDef_i.h" -#include "ExceptionDef_i.h" -#include "IFR_Service_Utils.h" -#include "IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ExtValueDef_i.h" +#include "orbsvcs/IFRService/ExceptionDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h index 802212bf0ab..d2390a47c4a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_EXTVALUEDEF_I_H #define TAO_EXTVALUEDEF_I_H -#include "ValueDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ValueDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp index 0664f117126..f1fd5ae8157 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "FactoryDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/FactoryDef_i.h" ACE_RCSID (IFRService, FactoryDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h index 2e788c6a4f2..38a366914ec 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_FACTORYDEF_I_H #define TAO_FACTORYDEF_I_H -#include "OperationDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/OperationDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp index 0d7e9b5983b..6fffd784ad3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "FinderDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/FinderDef_i.h" ACE_RCSID (IFRService, FinderDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h index aec902a1516..e8ad0a283d7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_FINDERDEF_I_H #define TAO_FINDERDEF_I_H -#include "OperationDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/OperationDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp index 56befc089a9..f8fdc472f04 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "FixedDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/FixedDef_i.h" ACE_RCSID (IFRService, FixedDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h index 6141f1262b3..326bc90185b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_FIXEDDEF_I_H #define TAO_FIXEDDEF_I_H -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp index 5caa2ee6f75..f70745a001e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "Repository_i.h" -#include "HomeDef_i.h" -#include "FactoryDef_i.h" -#include "FinderDef_i.h" -#include "ValueDef_i.h" -#include "ExceptionDef_i.h" -#include "AttributeDef_i.h" -#include "IFR_Service_Utils_T.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/HomeDef_i.h" +#include "orbsvcs/IFRService/FactoryDef_i.h" +#include "orbsvcs/IFRService/FinderDef_i.h" +#include "orbsvcs/IFRService/ValueDef_i.h" +#include "orbsvcs/IFRService/ExceptionDef_i.h" +#include "orbsvcs/IFRService/AttributeDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h index e18572359da..7436829cb68 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h @@ -21,14 +21,14 @@ #ifndef TAO_HOMEDEF_I_H #define TAO_HOMEDEF_I_H -#include "ExtInterfaceDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ExtInterfaceDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IFR_ComponentsS.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp index 46f57289ab4..83c64aff90e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "IDLType_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" ACE_RCSID (IFRService, IDLType_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h index 810d87dc757..8935d63aae6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h @@ -20,8 +20,8 @@ #ifndef TAO_IDLTYPE_I_H #define TAO_IDLTYPE_I_H -#include "IRObject_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IRObject_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp index 15ebfddd229..1da0c338611 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_IFR_BASES_CPP_ -#include "IFR_BaseS.h" +#include "orbsvcs/IFRService/IFR_BaseS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableServer/Upcall_Wrapper.h" @@ -69,7 +69,7 @@ #include "ace/Malloc_Allocator.h" #if !defined (__ACE_INLINE__) -#include "IFR_BaseS.inl" +#include "orbsvcs/IFRService/IFR_BaseS.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h index bd0d14d45f5..02963091e2a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h @@ -1246,10 +1246,10 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL -#include "IFR_BaseS_T.h" +#include "orbsvcs/IFRService/IFR_BaseS_T.h" #if defined (__ACE_INLINE__) -#include "IFR_BaseS.inl" +#include "orbsvcs/IFRService/IFR_BaseS.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp index c2d66dc74a8..4dff6ffb090 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_IFR_BASES_T_CPP_ #define _TAO_IDL_ORIG_IFR_BASES_T_CPP_ -#include "IFR_BaseS_T.h" +#include "orbsvcs/IFRService/IFR_BaseS_T.h" #if !defined (__ACE_INLINE__) -#include "IFR_BaseS_T.inl" +#include "orbsvcs/IFRService/IFR_BaseS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h index 396586e5433..1313c456c1d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h @@ -908,11 +908,11 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "IFR_BaseS_T.inl" +#include "orbsvcs/IFRService/IFR_BaseS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "IFR_BaseS_T.cpp" +#include "orbsvcs/IFRService/IFR_BaseS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp index 1fe85a7d2a5..62e82e0ad6e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_IFR_BASICS_CPP_ -#include "IFR_BasicS.h" +#include "orbsvcs/IFRService/IFR_BasicS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableServer/Upcall_Wrapper.h" @@ -69,7 +69,7 @@ #include "ace/Malloc_Allocator.h" #if !defined (__ACE_INLINE__) -#include "IFR_BasicS.inl" +#include "orbsvcs/IFRService/IFR_BasicS.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h index 6ea55966148..f1a3050b67c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h @@ -34,7 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/IFR_Client/IFR_BasicC.h" -#include "IFR_BaseS.h" +#include "orbsvcs/IFRService/IFR_BaseS.h" #include "tao/ParameterModeS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -7883,10 +7883,10 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL -#include "IFR_BasicS_T.h" +#include "orbsvcs/IFRService/IFR_BasicS_T.h" #if defined (__ACE_INLINE__) -#include "IFR_BasicS.inl" +#include "orbsvcs/IFRService/IFR_BasicS.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp index 1b3eeebb76a..03d51e6bba8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_IFR_BASICS_T_CPP_ #define _TAO_IDL_ORIG_IFR_BASICS_T_CPP_ -#include "IFR_BasicS_T.h" +#include "orbsvcs/IFRService/IFR_BasicS_T.h" #if !defined (__ACE_INLINE__) -#include "IFR_BasicS_T.inl" +#include "orbsvcs/IFRService/IFR_BasicS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h index f06759d4b3c..ebca0c6b9fe 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h @@ -7952,11 +7952,11 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "IFR_BasicS_T.inl" +#include "orbsvcs/IFRService/IFR_BasicS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "IFR_BasicS_T.cpp" +#include "orbsvcs/IFRService/IFR_BasicS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp index a9e2b380b37..ff99bba5658 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_ -#include "IFR_ComponentsS.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableServer/Upcall_Wrapper.h" @@ -67,7 +67,7 @@ #include "ace/Malloc_Allocator.h" #if !defined (__ACE_INLINE__) -#include "IFR_ComponentsS.inl" +#include "orbsvcs/IFRService/IFR_ComponentsS.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h index 13f64641067..91a17a070cc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h @@ -34,7 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/IFR_Client/IFR_ComponentsC.h" -#include "IFR_ExtendedS.h" +#include "orbsvcs/IFRService/IFR_ExtendedS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -5104,10 +5104,10 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL -#include "IFR_ComponentsS_T.h" +#include "orbsvcs/IFRService/IFR_ComponentsS_T.h" #if defined (__ACE_INLINE__) -#include "IFR_ComponentsS.inl" +#include "orbsvcs/IFRService/IFR_ComponentsS.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp index b2d75f94608..9ea48d226df 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_T_CPP_ #define _TAO_IDL_ORIG_IFR_COMPONENTSS_T_CPP_ -#include "IFR_ComponentsS_T.h" +#include "orbsvcs/IFRService/IFR_ComponentsS_T.h" #if !defined (__ACE_INLINE__) -#include "IFR_ComponentsS_T.inl" +#include "orbsvcs/IFRService/IFR_ComponentsS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h index f5868a35eb2..cad66ac774e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h @@ -5368,11 +5368,11 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "IFR_ComponentsS_T.inl" +#include "orbsvcs/IFRService/IFR_ComponentsS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "IFR_ComponentsS_T.cpp" +#include "orbsvcs/IFRService/IFR_ComponentsS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp index 57a991f3f8c..cfd97366bc6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_ -#include "IFR_ExtendedS.h" +#include "orbsvcs/IFRService/IFR_ExtendedS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableServer/Upcall_Wrapper.h" @@ -67,7 +67,7 @@ #include "ace/Malloc_Allocator.h" #if !defined (__ACE_INLINE__) -#include "IFR_ExtendedS.inl" +#include "orbsvcs/IFRService/IFR_ExtendedS.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h index 87f87bdbf01..a1385081787 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h @@ -34,7 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/IFR_Client/IFR_ExtendedC.h" -#include "IFR_BasicS.h" +#include "orbsvcs/IFRService/IFR_BasicS.h" #include "tao/AnyTypeCode/VisibilityS.h" #include "tao/AnyTypeCode/ValueModifierS.h" @@ -2125,10 +2125,10 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL -#include "IFR_ExtendedS_T.h" +#include "orbsvcs/IFRService/IFR_ExtendedS_T.h" #if defined (__ACE_INLINE__) -#include "IFR_ExtendedS.inl" +#include "orbsvcs/IFRService/IFR_ExtendedS.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp index 7821ed96169..0c4b6e67e52 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_T_CPP_ #define _TAO_IDL_ORIG_IFR_EXTENDEDS_T_CPP_ -#include "IFR_ExtendedS_T.h" +#include "orbsvcs/IFRService/IFR_ExtendedS_T.h" #if !defined (__ACE_INLINE__) -#include "IFR_ExtendedS_T.inl" +#include "orbsvcs/IFRService/IFR_ExtendedS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h index 936317c7330..9f6d959523c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h @@ -2013,11 +2013,11 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "IFR_ExtendedS_T.inl" +#include "orbsvcs/IFRService/IFR_ExtendedS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "IFR_ExtendedS_T.cpp" +#include "orbsvcs/IFRService/IFR_ExtendedS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp index 40d09f52ae5..a5e914dcf87 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp @@ -10,7 +10,7 @@ // Priyanka Gontla <pgontla@ece.uci.edu> // ================================================================ -#include "IFR_Service_Loader.h" +#include "orbsvcs/IFRService/IFR_Service_Loader.h" #include "ace/Dynamic_Service.h" #include "ace/Argv_Type_Converter.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h index 751ba68c8ed..4ed289fb58b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index 821224e8885..6d98478e2e2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "IFR_Service_Utils.h" -#include "IDLType_i.h" -#include "Container_i.h" -#include "Contained_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/Container_i.h" +#include "orbsvcs/IFRService/Contained_i.h" #include "orbsvcs/IFRService/ComponentRepository_i.h" #include "orbsvcs/IFRService/Options.h" #include "orbsvcs/IFRService/IFR_ComponentsS.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h index c23f75b1661..2b91098a1ee 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h @@ -25,7 +25,7 @@ #include /**/ "ace/pre.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/PortableServer/PortableServer.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp index deabd6d0ff5..848677edd13 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp @@ -3,9 +3,9 @@ #ifndef TAO_IFR_SERVICE_UTILS_T_CPP #define TAO_IFR_SERVICE_UTILS_T_CPP -#include "IFR_Service_Utils_T.h" -#include "IFR_Service_Utils.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/Repository_i.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h index 2f0df4be017..056582e494a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h @@ -113,7 +113,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "IFR_Service_Utils_T.cpp" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp index 57c6d85cfd3..9846d186808 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "IRObject_i.h" -#include "Repository_i.h" -#include "IDLType_i.h" -#include "Contained_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IRObject_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "tao/PortableServer/Root_POA.h" #include "tao/PortableServer/POA_Current_Impl.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h index 30733d02dfb..a6bbdc4adfa 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h @@ -22,13 +22,13 @@ #define TAO_IROBJECT_I_H #include "ace/Configuration.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IFR_ExtendedS.h" +#include "orbsvcs/IFRService/IFR_ExtendedS.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp index 0403aca795f..943a6082e1f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "InterfaceAttrExtension_i.h" -#include "Repository_i.h" -#include "InterfaceDef_i.h" -#include "OperationDef_i.h" -#include "AttributeDef_i.h" -#include "ExtAttributeDef_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/InterfaceDef_i.h" +#include "orbsvcs/IFRService/OperationDef_i.h" +#include "orbsvcs/IFRService/AttributeDef_i.h" +#include "orbsvcs/IFRService/ExtAttributeDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h index e2f231af0e7..f330fe3dec6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h @@ -20,8 +20,8 @@ #ifndef TAO_INTERFACEATTREXTENSION_I_H #define TAO_INTERFACEATTREXTENSION_I_H -#include "IRObject_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IRObject_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp index 64a61678227..6360f9c745f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "InterfaceDef_i.h" -#include "Repository_i.h" -#include "AttributeDef_i.h" -#include "OperationDef_i.h" -#include "IFR_Service_Utils.h" -#include "IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/InterfaceDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/AttributeDef_i.h" +#include "orbsvcs/IFRService/OperationDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h index 1b32b2d23db..4d010fa0d48 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h @@ -21,10 +21,10 @@ #ifndef TAO_INTERFACEDEF_I_H #define TAO_INTERFACEDEF_I_H -#include "Container_i.h" -#include "Contained_i.h" -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Container_i.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp index 03c7bd1e6a3..dab11360086 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "LocalInterfaceDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/LocalInterfaceDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" ACE_RCSID (IFRService, LocalInterfaceDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h index aeb91cf0483..92bfd1be945 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_LOCALINTERFACEDEF_I_H #define TAO_LOCALINTERFACEDEF_I_H -#include "InterfaceDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/InterfaceDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp index affebfc885b..731d9aaf511 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ModuleDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/ModuleDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h index df8d915f4c0..8c178c7cf50 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h @@ -22,9 +22,9 @@ #define TAO_MODULEDEF_I_H //#include "Container_i.h" -#include "Contained_i.h" -#include "ComponentModuleDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ComponentModuleDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp index b5d73bba38e..e207ffe8823 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "NativeDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/NativeDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h index 91425e09ad5..d6960a185e9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_NATIVEDEF_I_H #define TAO_NATIVEDEF_I_H -#include "TypedefDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp index 6b78e7c25e6..cf8d8a91ba9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "OperationDef_i.h" -#include "Repository_i.h" -#include "IDLType_i.h" -#include "ExceptionDef_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/OperationDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ExceptionDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h index d309e1fd06c..f11a2850319 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_OPERATIONDEF_I_H #define TAO_OPERATIONDEF_I_H -#include "Contained_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp index 13533f28a58..26f71866bfd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Options.h" +#include "orbsvcs/IFRService/Options.h" #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.h b/TAO/orbsvcs/orbsvcs/IFRService/Options.h index 79554df38f9..f1453559b03 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.h @@ -24,7 +24,7 @@ #include "ace/Singleton.h" #include "ace/Null_Mutex.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #include "tao/Versioned_Namespace.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp index 5fd58f1639f..f9789c4282b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "PrimitiveDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/PrimitiveDef_i.h" ACE_RCSID (IFRService, PrimitiveDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h index fef725da150..05103c5c7ed 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_PRIMITIVEDEF_I_H #define TAO_PRIMITIVEDEF_I_H -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp index 9d859d45567..f9bf6490763 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "Repository_i.h" -#include "ProvidesDef_i.h" -#include "IFR_ComponentsS.h" -#include "IFR_Service_Utils_T.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ProvidesDef_i.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h index 30c04de398f..e07923a3fee 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h @@ -20,8 +20,8 @@ #ifndef TAO_PROVIDESDEF_I_H #define TAO_PROVIDESDEF_I_H -#include "Contained_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp index 8b6df87e6b6..1a06feb5687 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp @@ -1,8 +1,8 @@ /* -*- C++ -*- */ // $Id$ -#include "PublishesDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/PublishesDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" ACE_RCSID (IFRService, PublishesDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h index fbfeb8adbdd..613bc9010e1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h @@ -20,8 +20,8 @@ #ifndef TAO_PUBLISHESDEF_I_H #define TAO_PUBLISHESDEF_I_H -#include "EventPortDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/EventPortDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp index 94404797eb9..a6e4c6a6051 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "RecursDef_i.h" +#include "orbsvcs/IFRService/RecursDef_i.h" ACE_RCSID (IFRService, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h index 203c78c3236..5fdf5b7e7a0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h @@ -21,7 +21,7 @@ #ifndef TAO_RECURSDEF_I_H #define TAO_RECURSDEF_I_H -#include "TypedefDef_i.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" #include "ace/SString.h" #include "ace/OS_NS_stdlib.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index 484e829b333..028f07f18cc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "concrete_classes.h" -#include "Repository_i.h" -#include "IDLType_i.h" -#include "Options.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/concrete_classes.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/Options.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "tao/ORB.h" #include "tao/Object_KeyC.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h index e5adc59accc..06cbfdc2360 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h @@ -21,8 +21,8 @@ #ifndef REPOSITORY_I_H #define REPOSITORY_I_H -#include "Container_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Container_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,7 +33,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "IFR_macro.h" +#include "orbsvcs/IFRService/IFR_macro.h" #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h" #include "tao/CORBA_String.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp index 1d14b090c1e..5f7465b47fe 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "SequenceDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/SequenceDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h index 85fad8e044f..cbed0039d88 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h @@ -21,8 +21,8 @@ #ifndef SEQUENCEDEF_I_H #define SEQUENCEDEF_I_H -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp index 51b6729ed30..b8068cdb642 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "StringDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/StringDef_i.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h index 99b8ee22326..5f1e402b8ce 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_STRINGDEF_I_H #define TAO_STRINGDEF_I_H -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp index eaa20ccdcf7..e4cef6229e6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "StructDef_i.h" -#include "RecursDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/StructDef_i.h" +#include "orbsvcs/IFRService/RecursDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h index 1eff26460cc..a679e5ff3dd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h @@ -21,9 +21,9 @@ #ifndef TAO_STRUCTDEF_I_H #define TAO_STRUCTDEF_I_H -#include "TypedefDef_i.h" -#include "Container_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" +#include "orbsvcs/IFRService/Container_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp index 43e4bb44ed0..3261a380750 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "TypedefDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h index b6037230db7..1d836a105d2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h @@ -21,9 +21,9 @@ #ifndef TAO_TYPEDEFDEF_I_H #define TAO_TYPEDEFDEF_I_H -#include "Contained_i.h" -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp index c21eb8b8e4c..efc0446c718 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "UnionDef_i.h" -#include "RecursDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/UnionDef_i.h" +#include "orbsvcs/IFRService/RecursDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h index ea26a0a3de5..feace1c2ec5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h @@ -21,9 +21,9 @@ #ifndef TAO_UNIONDEF_I_H #define TAO_UNIONDEF_I_H -#include "TypedefDef_i.h" -#include "Container_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" +#include "orbsvcs/IFRService/Container_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp index 4f8ac2424a9..833a7fd0c6a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Repository_i.h" -#include "UsesDef_i.h" -#include "IFR_Service_Utils_T.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/UsesDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h index 9ba4e6800dc..c0daa00be10 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_USESDEF_I_H #define TAO_USESDEF_I_H -#include "Contained_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp index 7c1fdcbc193..c8a710dcc23 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "ValueBoxDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/ValueBoxDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h index 287aef87fa5..9fd68ca1cc8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_VALUEBOXDEF_I_H #define TAO_VALUEBOXDEF_I_H -#include "TypedefDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp index 2447364b7ee..9968cf84a82 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Repository_i.h" -#include "ValueDef_i.h" -#include "AttributeDef_i.h" -#include "OperationDef_i.h" -#include "IFR_Service_Utils.h" -#include "IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ValueDef_i.h" +#include "orbsvcs/IFRService/AttributeDef_i.h" +#include "orbsvcs/IFRService/OperationDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h index 53c6b530e41..0d5dd9d7f9f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h @@ -21,9 +21,9 @@ #ifndef TAO_VALUEDEF_I_H #define TAO_VALUEDEF_I_H -#include "Contained_i.h" -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp index a503b34cb32..bb6b101ddd0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "Repository_i.h" -#include "ValueMemberDef_i.h" -#include "IDLType_i.h" -#include "IFR_Service_Utils_T.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ValueMemberDef_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h index aa0c859207b..1da19410d15 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_VALUEMEMBERDEF_I_H #define TAO_VALUEMEMBERDEF_I_H -#include "Contained_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp index 69efbfd6554..252050a2855 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "WstringDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/WstringDef_i.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h index 4e9d8faa2d5..c1317c0a888 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_WSTRINGDEF_I_H #define TAO_WSTRINGDEF_I_H -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h b/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h index 917db83e7a4..27407fa581c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h @@ -19,36 +19,36 @@ #ifndef CONCRETE_CLASSES_H #define CONCRETE_CLASSES_H -#include "PrimitiveDef_i.h" -#include "StringDef_i.h" -#include "WstringDef_i.h" -#include "SequenceDef_i.h" -#include "ArrayDef_i.h" -#include "FixedDef_i.h" -#include "EnumDef_i.h" -#include "AliasDef_i.h" -#include "NativeDef_i.h" -#include "ValueBoxDef_i.h" -#include "UnionDef_i.h" -#include "StructDef_i.h" -#include "ValueMemberDef_i.h" -#include "FactoryDef_i.h" -#include "AttributeDef_i.h" -#include "ConstantDef_i.h" -#include "ValueDef_i.h" -#include "ExceptionDef_i.h" -#include "ModuleDef_i.h" -#include "ExtAbstractInterfaceDef_i.h" -#include "ExtLocalInterfaceDef_i.h" +#include "orbsvcs/IFRService/PrimitiveDef_i.h" +#include "orbsvcs/IFRService/StringDef_i.h" +#include "orbsvcs/IFRService/WstringDef_i.h" +#include "orbsvcs/IFRService/SequenceDef_i.h" +#include "orbsvcs/IFRService/ArrayDef_i.h" +#include "orbsvcs/IFRService/FixedDef_i.h" +#include "orbsvcs/IFRService/EnumDef_i.h" +#include "orbsvcs/IFRService/AliasDef_i.h" +#include "orbsvcs/IFRService/NativeDef_i.h" +#include "orbsvcs/IFRService/ValueBoxDef_i.h" +#include "orbsvcs/IFRService/UnionDef_i.h" +#include "orbsvcs/IFRService/StructDef_i.h" +#include "orbsvcs/IFRService/ValueMemberDef_i.h" +#include "orbsvcs/IFRService/FactoryDef_i.h" +#include "orbsvcs/IFRService/AttributeDef_i.h" +#include "orbsvcs/IFRService/ConstantDef_i.h" +#include "orbsvcs/IFRService/ValueDef_i.h" +#include "orbsvcs/IFRService/ExceptionDef_i.h" +#include "orbsvcs/IFRService/ModuleDef_i.h" +#include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h" +#include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h" -#include "ComponentDef_i.h" -#include "HomeDef_i.h" -#include "FinderDef_i.h" -#include "ConsumesDef_i.h" -#include "PublishesDef_i.h" -#include "EmitsDef_i.h" -#include "EventDef_i.h" -#include "ProvidesDef_i.h" -#include "UsesDef_i.h" +#include "orbsvcs/IFRService/ComponentDef_i.h" +#include "orbsvcs/IFRService/HomeDef_i.h" +#include "orbsvcs/IFRService/FinderDef_i.h" +#include "orbsvcs/IFRService/ConsumesDef_i.h" +#include "orbsvcs/IFRService/PublishesDef_i.h" +#include "orbsvcs/IFRService/EmitsDef_i.h" +#include "orbsvcs/IFRService/EventDef_i.h" +#include "orbsvcs/IFRService/ProvidesDef_i.h" +#include "orbsvcs/IFRService/UsesDef_i.h" #endif /* CONCRETE_CLASSES_H */ diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp index 3f2b08d662d..73a947638cf 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "IOR_Multicast.h" +#include "orbsvcs/IOR_Multicast.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index da1e1a929a8..5ea2a76ec77 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -1,4 +1,4 @@ -#include "LB_CPU_Load_Average_Monitor.h" +#include "orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_time.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index 9b33673f9b4..48a8267e189 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -1,4 +1,4 @@ -#include "LB_CPU_Utilization_Monitor.h" +#include "orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_time.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp index 49a72b64eb4..abfe60c3f23 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp @@ -1,5 +1,5 @@ -#include "LB_ClientComponent.h" -#include "LB_ClientORBInitializer.h" +#include "orbsvcs/LoadBalancing/LB_ClientComponent.h" +#include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h" #include "tao/ORB_Constants.h" #include "tao/ORBInitializer_Registry.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp index 8b73e8bbb0d..10ef40d2a54 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp @@ -1,5 +1,5 @@ -#include "LB_ClientORBInitializer.h" -#include "LB_ClientRequestInterceptor.h" +#include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h" +#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp index fc4415857e8..870a88577d2 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp @@ -1,4 +1,4 @@ -#include "LB_ClientRequestInterceptor.h" +#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h" #include "orbsvcs/CosLoadBalancingC.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp index 6a83695733e..3e6d76a10aa 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp @@ -1,5 +1,5 @@ -#include "LB_Component.h" -#include "LB_ORBInitializer.h" +#include "orbsvcs/LoadBalancing/LB_Component.h" +#include "orbsvcs/LoadBalancing/LB_ORBInitializer.h" #include "tao/ORB_Constants.h" #include "tao/ORBInitializer_Registry.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp index 39660567fae..6af1cad1b42 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp @@ -1,6 +1,6 @@ -#include "LB_IORInterceptor.h" -#include "LB_ObjectReferenceFactory.h" -#include "LB_LoadAlert.h" +#include "orbsvcs/LoadBalancing/LB_IORInterceptor.h" +#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h" +#include "orbsvcs/LoadBalancing/LB_LoadAlert.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 010a1e9eee1..00c4fa6203d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -1,6 +1,6 @@ -#include "LB_LeastLoaded.h" -#include "LB_LoadMap.h" -#include "LB_Random.h" +#include "orbsvcs/LoadBalancing/LB_LeastLoaded.h" +#include "orbsvcs/LoadBalancing/LB_LoadMap.h" +#include "orbsvcs/LoadBalancing/LB_Random.h" #include "orbsvcs/PortableGroup/PG_conf.h" @@ -17,7 +17,7 @@ ACE_RCSID (LoadBalancing, #if !defined (__ACE_INLINE__) -#include "LB_LeastLoaded.inl" +#include "orbsvcs/LoadBalancing/LB_LeastLoaded.inl" #endif /* defined INLINE */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index 902136d3326..a7843028c66 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "LB_LoadMap.h" +#include "orbsvcs/LoadBalancing/LB_LoadMap.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -221,7 +221,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "LB_LeastLoaded.inl" +#include "orbsvcs/LoadBalancing/LB_LeastLoaded.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp index 8cc754b8283..a57212dbce6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp @@ -1,4 +1,4 @@ -#include "LB_LoadAlert.h" +#include "orbsvcs/LoadBalancing/LB_LoadAlert.h" ACE_RCSID (LoadBalancer, @@ -6,7 +6,7 @@ ACE_RCSID (LoadBalancer, "$Id$") #if !defined (__ACE_INLINE__) -# include "LB_LoadAlert.inl" +# include "orbsvcs/LoadBalancing/LB_LoadAlert.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h index b13ec10d0a9..f5345ef7f07 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h @@ -79,7 +79,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "LB_LoadAlert.inl" +# include "orbsvcs/LoadBalancing/LB_LoadAlert.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp index efdbc3875ee..0378e9f584e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp @@ -1,4 +1,4 @@ -#include "LB_LoadAlertInfo.h" +#include "orbsvcs/LoadBalancing/LB_LoadAlertInfo.h" #include "orbsvcs/PortableGroup/PG_Operators.h" ACE_RCSID (LoadBalancing, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h index e513edfca9a..5451acafddb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "LB_LoadAlertInfo.h" +#include "orbsvcs/LoadBalancing/LB_LoadAlertInfo.h" #include "orbsvcs/PortableGroup/PG_Location_Hash.h" #include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp index 84c2b575e11..ca2bf1b5116 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp @@ -1,4 +1,4 @@ -#include "LB_LoadAlert_Handler.h" +#include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index b4814587ed7..c6a0d0c3fa3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -1,6 +1,6 @@ -#include "LB_LoadAverage.h" -#include "LB_LoadMap.h" -#include "LB_Random.h" +#include "orbsvcs/LoadBalancing/LB_LoadAverage.h" +#include "orbsvcs/LoadBalancing/LB_LoadMap.h" +#include "orbsvcs/LoadBalancing/LB_Random.h" #include "orbsvcs/PortableGroup/PG_conf.h" @@ -17,7 +17,7 @@ ACE_RCSID (LoadBalancing, #if !defined (__ACE_INLINE__) -#include "LB_LoadAverage.inl" +#include "orbsvcs/LoadBalancing/LB_LoadAverage.inl" #endif /* defined INLINE */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h index cf951720031..4af286ee527 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "LB_LoadMap.h" +#include "orbsvcs/LoadBalancing/LB_LoadMap.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -176,7 +176,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "LB_LoadAverage.inl" +#include "orbsvcs/LoadBalancing/LB_LoadAverage.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index f1d851a7126..ae0f10be8de 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -1,12 +1,12 @@ -#include "LB_LoadManager.h" -#include "LB_MemberLocator.h" -#include "LB_LoadAlert_Handler.h" -#include "LB_RoundRobin.h" -#include "LB_Random.h" -#include "LB_LoadMinimum.h" -#include "LB_LoadAverage.h" -#include "LB_LeastLoaded.h" -#include "LB_conf.h" +#include "orbsvcs/LoadBalancing/LB_LoadManager.h" +#include "orbsvcs/LoadBalancing/LB_MemberLocator.h" +#include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h" +#include "orbsvcs/LoadBalancing/LB_RoundRobin.h" +#include "orbsvcs/LoadBalancing/LB_Random.h" +#include "orbsvcs/LoadBalancing/LB_LoadMinimum.h" +#include "orbsvcs/LoadBalancing/LB_LoadAverage.h" +#include "orbsvcs/LoadBalancing/LB_LeastLoaded.h" +#include "orbsvcs/LoadBalancing/LB_conf.h" #include "orbsvcs/PortableGroup/PG_Property_Utils.h" #include "orbsvcs/PortableGroup/PG_conf.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h index fd78e205f3b..42ce6c006c4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -23,10 +23,10 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "LB_LoadAlertMap.h" -#include "LB_MonitorMap.h" -#include "LB_LoadListMap.h" -#include "LB_Pull_Handler.h" +#include "orbsvcs/LoadBalancing/LB_LoadAlertMap.h" +#include "orbsvcs/LoadBalancing/LB_MonitorMap.h" +#include "orbsvcs/LoadBalancing/LB_LoadListMap.h" +#include "orbsvcs/LoadBalancing/LB_Pull_Handler.h" #include "orbsvcs/PortableGroupC.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index ea04dc0bc50..b271606a0fb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -1,7 +1,7 @@ -#include "LB_LoadMinimum.h" +#include "orbsvcs/LoadBalancing/LB_LoadMinimum.h" #include "ace/OS_NS_sys_time.h" -#include "LB_LoadMap.h" -#include "LB_Random.h" +#include "orbsvcs/LoadBalancing/LB_LoadMap.h" +#include "orbsvcs/LoadBalancing/LB_Random.h" #include "orbsvcs/PortableGroup/PG_conf.h" @@ -18,7 +18,7 @@ ACE_RCSID (LoadBalancing, #if !defined (__ACE_INLINE__) -#include "LB_LoadMinimum.inl" +#include "orbsvcs/LoadBalancing/LB_LoadMinimum.inl" #endif /* defined INLINE */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h index 33f8bd1f19e..c979845aa0c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "LB_LoadMap.h" +#include "orbsvcs/LoadBalancing/LB_LoadMap.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -200,7 +200,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "LB_LoadMinimum.inl" +#include "orbsvcs/LoadBalancing/LB_LoadMinimum.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp index 2c2f97113e7..31c4e10977e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp @@ -1,5 +1,5 @@ -#include "LB_LoadManager.h" -#include "LB_MemberLocator.h" +#include "orbsvcs/LoadBalancing/LB_LoadManager.h" +#include "orbsvcs/LoadBalancing/LB_MemberLocator.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp index 128c89d6bd7..e7e7eeb4443 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp @@ -1,6 +1,6 @@ -#include "LB_ORBInitializer.h" -#include "LB_IORInterceptor.h" -#include "LB_ServerRequestInterceptor.h" +#include "orbsvcs/LoadBalancing/LB_ORBInitializer.h" +#include "orbsvcs/LoadBalancing/LB_IORInterceptor.h" +#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h" #include "orbsvcs/CosLoadBalancingC.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h index b37289443f6..292e36558ab 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "LB_LoadAlert.h" +#include "orbsvcs/LoadBalancing/LB_LoadAlert.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index 1bdc3a20eca..7fa2874b40b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -1,4 +1,4 @@ -#include "LB_ObjectReferenceFactory.h" +#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h" ACE_RCSID (LoadBalancing, LB_ObjectReferenceFactory, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp index 4bce39836d7..5e8cdf226ec 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp @@ -1,5 +1,5 @@ -#include "LB_Pull_Handler.h" -#include "LB_LoadManager.h" +#include "orbsvcs/LoadBalancing/LB_Pull_Handler.h" +#include "orbsvcs/LoadBalancing/LB_LoadManager.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h index 1d68391ad59..a18efd9d961 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "LB_MonitorMap.h" +#include "orbsvcs/LoadBalancing/LB_MonitorMap.h" #include "ace/Event_Handler.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp index 9a5106cc842..56c39655f2d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "LB_Random.h" +#include "orbsvcs/LoadBalancing/LB_Random.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_time.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp index d0163cff990..ab865f8020e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "LB_RoundRobin.h" +#include "orbsvcs/LoadBalancing/LB_RoundRobin.h" #include "orbsvcs/PortableGroup/PG_conf.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp index edd948de75a..10bb3303a39 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp @@ -1,5 +1,5 @@ -#include "LB_ServerRequestInterceptor.h" -#include "LB_LoadAlert.h" +#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h" +#include "orbsvcs/LoadBalancing/LB_LoadAlert.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index 6e28231c4a7..1ee94e0799c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -28,7 +28,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/Log/Log_i.h" -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.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/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h index 7e93c2a4814..fac7eb9bbb9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h @@ -30,7 +30,7 @@ #include "orbsvcs/Log/Log_i.h" #include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "eventlog_serv_export.h" +#include "orbsvcs/Log/eventlog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h index b17a0c7af89..ea8e6e5c63f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h @@ -30,7 +30,7 @@ #include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" -#include "EventLog_i.h" +#include "orbsvcs/Log/EventLog_i.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h index ad6efbb0c7c..88306c2eac7 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h @@ -27,7 +27,7 @@ #include "orbsvcs/DsEventLogAdminS.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "orbsvcs/CosEventCommS.h" -#include "eventlog_serv_export.h" +#include "orbsvcs/Log/eventlog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h index e5bb5bce876..65c2f4798a9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h @@ -32,7 +32,7 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/Log/EventLogConsumer.h" -#include "eventlog_serv_export.h" +#include "orbsvcs/Log/eventlog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp index 0f3fc970c05..f23b113e3d0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp @@ -1,4 +1,4 @@ -#include "Hash_Iterator_i.h" +#include "orbsvcs/Log/Hash_Iterator_i.h" #include "orbsvcs/Log/Log_Constraint_Interpreter.h" #include "orbsvcs/Log/Log_Constraint_Visitors.h" #include "orbsvcs/DsLogAdminC.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h index 890b5b2114c..cd50f3a621b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h @@ -29,7 +29,7 @@ #include "ace/Null_Mutex.h" #include "ace/RW_Thread_Mutex.h" #include "ace/Reactor.h" -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.h" #define LOG_DEFAULT_MAX_REC_LIST_LEN 100 diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h index 41314e7affa..e56fd676a30 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h @@ -27,7 +27,7 @@ #include "ace/Synch_Traits.h" #include "ace/Null_Mutex.h" #include "ace/RW_Thread_Mutex.h" -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Reactor; diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h index 6571a64b64d..acfa7b89f63 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h @@ -27,7 +27,7 @@ #include "orbsvcs/DsLogAdminS.h" #include "ace/Event_Handler.h" #include "ace/Reactor.h" -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.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/LogActivator.h b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h index ac31237bbc4..c25f466b0ed 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h @@ -18,7 +18,7 @@ #if (TAO_HAS_MINIMUM_POA == 0) -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.h" #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/ServantActivatorC.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index c9525aba01f..1137822914f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -1,5 +1,5 @@ -#include "LogMgr_i.h" -#include "LogActivator.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogActivator.h" #include "ace/Dynamic_Service.h" #include "tao/Utils/PolicyList_Destroyer.h" #include "orbsvcs/Log/Hash_Persistence_Strategy.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h index 8fc9731083a..8ce52e13977 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -26,7 +26,7 @@ #include "orbsvcs/Log/Log_i.h" #include "orbsvcs/Log/Log_Persistence_Strategy.h" -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h index 8d76e917e00..32b68ecae1f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h @@ -25,7 +25,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/DsLogNotificationS.h" -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h index dbf71602226..a16fd00e5f5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/DsLogAdminC.h" -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h index 2d63062e069..d87124c3df1 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h @@ -31,8 +31,8 @@ #include "ace/Containers.h" #include "ace/Hash_Map_Manager.h" #include "ace/Null_Mutex.h" -#include "log_serv_export.h" -#include "PersistStore.h" +#include "orbsvcs/Log/log_serv_export.h" +#include "orbsvcs/Log/PersistStore.h" #define PERSISTENT_LOG_FILE_NAME "LOG.DATA" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogStore.h b/TAO/orbsvcs/orbsvcs/Log/LogStore.h index d7d73e490ab..78773abffb9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogStore.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/DsLogAdminC.h" -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h index 4309f9bd594..3e51de61602 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h @@ -12,7 +12,7 @@ #ifndef TAO_TLS_COMPACTION_HANDLER_H #define TAO_TLS_COMPACTION_HANDLER_H -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp index 6e03cd2c04c..e741de09004 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp @@ -1,6 +1,6 @@ -#include "Log_Constraint_Interpreter.h" +#include "orbsvcs/Log/Log_Constraint_Interpreter.h" -#include "Log_Constraint_Visitors.h" +#include "orbsvcs/Log/Log_Constraint_Visitors.h" ACE_RCSID (Log, Log_Constraint_Interpreter, diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h index 24be44df2c9..18f754d8c79 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h @@ -27,7 +27,7 @@ #include "orbsvcs/ETCL/ETCL_Constraint.h" #include "orbsvcs/DsLogAdminC.h" -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index 3ddb524b557..1bb726c263e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -1,4 +1,4 @@ -#include "Log_Constraint_Visitors.h" +#include "orbsvcs/Log/Log_Constraint_Visitors.h" #include "orbsvcs/ETCL/ETCL_Constraint.h" #include "orbsvcs/ETCL/ETCL_y.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h index 488c70f18dc..f9067132c3b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h @@ -29,7 +29,7 @@ #include "orbsvcs/DsLogAdminC.h" #include "ace/Null_Mutex.h" -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h index e2900cca27d..f61d40ad999 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h @@ -12,7 +12,7 @@ #ifndef TAO_TLS_FLUSH_HANDLER_H #define TAO_TLS_FLUSH_HANDLER_H -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h index bdd40dba9dd..3e16a89a70d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 103d6c6f7f1..aab900a1e62 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -32,7 +32,7 @@ #include "orbsvcs/Log/LogRecordStore.h" #include "orbsvcs/DsLogAdminS.h" #include "ace/Reactor.h" -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h index 4f92f0b83f5..c464e91f8d4 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h @@ -27,7 +27,7 @@ #include "orbsvcs/DsNotifyLogAdminS.h" #include "orbsvcs/Log/Log_i.h" -#include "notifylog_serv_export.h" +#include "orbsvcs/Log/notifylog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h index ca31bba2364..bbe8127c077 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h @@ -26,7 +26,7 @@ #include "orbsvcs/DsLogAdminS.h" #include "orbsvcs/Log/LogMgr_i.h" -#include "NotifyLog_i.h" +#include "orbsvcs/Log/NotifyLog_i.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h index aac99386d03..00e86066473 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h @@ -27,7 +27,7 @@ #include "orbsvcs/CosNotifyChannelAdminS.h" #include "orbsvcs/CosNotifyCommC.h" -#include "notifylog_serv_export.h" +#include "orbsvcs/Log/notifylog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h index a0d41ff67c7..ff1c8bb70f3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h @@ -29,7 +29,7 @@ #include "orbsvcs/Log/Log_i.h" #include "orbsvcs/Log/NotifyLogConsumer.h" -#include "notifylog_serv_export.h" +#include "orbsvcs/Log/notifylog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp index 1e8b7d5b188..cd4de8a0606 100644 --- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp @@ -1,4 +1,4 @@ -#include "PersistStore.h" +#include "orbsvcs/Log/PersistStore.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h index 45cfbf6f3c5..4b6a7e0fcc3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h @@ -26,7 +26,7 @@ #include "orbsvcs/DsLogAdminC.h" #include "ace/Mutex.h" -#include "log_serv_export.h" +#include "orbsvcs/Log/log_serv_export.h" #define PERSIST_LOG_DEFAULT_MAX_REC_LIST_LEN 250 diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h index 624777e1d5e..05fdb9d65f4 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h @@ -30,7 +30,7 @@ #include "orbsvcs/Event/EC_Factory.h" #include "orbsvcs/Event/EC_Defaults.h" -#include "rteventlog_serv_export.h" +#include "orbsvcs/Log/rteventlog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h index f379742803a..d416bd028ec 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h @@ -28,8 +28,8 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/RtecSchedulerS.h" -#include "RTEventLog_i.h" -#include "rteventlog_serv_export.h" +#include "orbsvcs/Log/RTEventLog_i.h" +#include "orbsvcs/Log/rteventlog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h index da4ef9cde83..785efe87c79 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h @@ -30,7 +30,7 @@ #include "orbsvcs/Event/EC_ProxySupplier.h" #include "orbsvcs/Event/EC_ProxyConsumer.h" -#include "rteventlog_serv_export.h" +#include "orbsvcs/Log/rteventlog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h index 4caea21f899..7573fe87887 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h @@ -31,7 +31,7 @@ #include "orbsvcs/Event/EC_Defaults.h" #include "orbsvcs/Log/RTEventLogConsumer.h" -#include "rteventlog_serv_export.h" +#include "orbsvcs/Log/rteventlog_serv_export.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp index 3a04aca99f0..42663238c81 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp @@ -3,10 +3,10 @@ #ifndef METRICS_FRAME_MANAGER_CPP #define METRICS_FRAME_MANAGER_CPP -#include "Metrics_FrameManager.h" +#include "orbsvcs/Metrics/Metrics_FrameManager.h" #if !defined (__ACE_INLINE__) -#include "Metrics_FrameManager.i" +#include "orbsvcs/Metrics/Metrics_FrameManager.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h index c9dbf14fd0d..689ed44ee6f 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h @@ -15,13 +15,13 @@ #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/RtecSchedulerC.h" -#include "Metrics_Utils.h" +#include "orbsvcs/Metrics/Metrics_Utils.h" #if defined (__ACE_INLINE__) -#include "Metrics_FrameManager.i" +#include "orbsvcs/Metrics/Metrics_FrameManager.i" #endif /* __ACE_INLINE__ */ -#include "Metrics_FrameManager_T.h" +#include "orbsvcs/Metrics/Metrics_FrameManager_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp index 64bf39f09f8..d8ff5ef8e8b 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp @@ -3,10 +3,10 @@ #ifndef METRICS_FRAME_MANAGER_T_CPP #define METRICS_FRAME_MANAGER_T_CPP -#include "Metrics_FrameManager_T.h" +#include "orbsvcs/Metrics/Metrics_FrameManager_T.h" #if !defined (__ACE_INLINE__) -#include "Metrics_FrameManager_T.i" +#include "orbsvcs/Metrics/Metrics_FrameManager_T.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h index 6eefdbf19f9..a3226d8647c 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h @@ -262,7 +262,7 @@ protected: }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Metrics_FrameManager_T.cpp" +#include "orbsvcs/Metrics/Metrics_FrameManager_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) @@ -270,7 +270,7 @@ protected: #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if defined (__ACE_INLINE__) -#include "Metrics_FrameManager_T.i" +#include "orbsvcs/Metrics/Metrics_FrameManager_T.i" #endif /* __ACE_INLINE__ */ #endif /* METRICS_FRAME_MANAGER_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp index 73933c27eb1..c1b7f9eb788 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp @@ -3,10 +3,10 @@ #ifndef METRICS_LOCAL_CACHE_CPP #define METRICS_LOCAL_CACHE_CPP -#include "Metrics_LocalCache.h" +#include "orbsvcs/Metrics/Metrics_LocalCache.h" #if !defined (__ACE_INLINE__) -#include "Metrics_LocalCache.i" +#include "orbsvcs/Metrics/Metrics_LocalCache.i" #endif /* __ACE_INLINE__ */ #endif /* METRICS_LOCAL_CACHE_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h index a4ca25b7046..71fcb092381 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h @@ -24,13 +24,13 @@ #include "orbsvcs/Scheduler_Factory.h" #include "orbsvcs/MetricsC.h" -#include "Metrics_Utils.h" +#include "orbsvcs/Metrics/Metrics_Utils.h" #if defined (ACE_METRICS_COLLECTION) #if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES) -#include "Metrics_LocalCache_T.h" +#include "orbsvcs/Metrics/Metrics_LocalCache_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -103,7 +103,7 @@ METRICS_LOGGER_REF); \ TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Metrics_LocalCache.i" +#include "orbsvcs/Metrics/Metrics_LocalCache.i" #endif /* __ACE_INLINE__ */ #endif /* ACE_ENABLE_TIMEPROBES && ACE_COMPILE_TIMEPROBES */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp index 68fedf4d825..2478ce10532 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp @@ -3,7 +3,7 @@ #ifndef METRICS_LOCAL_CACHE_T_CPP #define METRICS_LOCAL_CACHE_T_CPP -#include "Metrics_LocalCache_T.h" +#include "orbsvcs/Metrics/Metrics_LocalCache_T.h" #if defined VXWORKS #include <cacheLib.h> diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h index 79502ec49d9..97d51de3248 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h @@ -319,7 +319,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Metrics_LocalCache_T.cpp" +#include "orbsvcs/Metrics/Metrics_LocalCache_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp index 7b2db145322..71f0e444678 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Metrics_Logger.h" +#include "orbsvcs/Metrics/Metrics_Logger.h" #include "ace/Auto_Ptr.h" #include "ace/ace_wchar.h" diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h index 96bb3852712..f836ca5faf3 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h @@ -32,7 +32,7 @@ #include "orbsvcs/MetricsS.h" #include "orbsvcs/RtecEventCommS.h" -#include "Metrics_Utils.h" +#include "orbsvcs/Metrics/Metrics_Utils.h" #if defined (METRICS_LOGGER_SENDS_EVENTS) #include "MetricsC.h" diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp index d593c8aa5ca..fe4ec645da8 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp @@ -3,14 +3,14 @@ #ifndef METRICS_UPCALL_MONITOR_CPP #define METRICS_UPCALL_MONITOR_CPP -#include "Metrics_UpcallMonitor.h" +#include "orbsvcs/Metrics/Metrics_UpcallMonitor.h" #if defined (ACE_METRICS_COLLECTION) #if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES) #if !defined (__ACE_INLINE__) -#include "Metrics_UpcallMonitor.i" +#include "orbsvcs/Metrics/Metrics_UpcallMonitor.i" #endif /* __ACE_INLINE__ */ #else diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h index 6a525695057..69dde8b966c 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h @@ -24,9 +24,9 @@ #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/MetricsS.h" -#include "Metrics_LocalCache.h" -#include "Metrics_FrameManager.h" -#include "Metrics_Utils.h" +#include "orbsvcs/Metrics/Metrics_LocalCache.h" +#include "orbsvcs/Metrics/Metrics_FrameManager.h" +#include "orbsvcs/Metrics/Metrics_Utils.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -229,7 +229,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Metrics_UpcallMonitor.i" +#include "orbsvcs/Metrics/Metrics_UpcallMonitor.i" #endif /* __ACE_INLINE__ */ #include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp index 227412fe3c7..333b49c3ff6 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp @@ -3,10 +3,10 @@ #ifndef METRICS_UPCALL_MONITOR_T_CPP #define METRICS_UPCALL_MONITOR_T_CPP -#include "Metrics_UpcallMonitor_T.h" +#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.h" #if !defined (__ACE_INLINE__) -#include "Metrics_UpcallMonitor_T.i" +#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h index 8bdb52acf44..e3873a65287 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h @@ -13,8 +13,8 @@ #endif /* ! VXWORKS */ -#include "Metrics_LocalCache.h" -#include "Metrics_FrameManager.h" +#include "orbsvcs/Metrics/Metrics_LocalCache.h" +#include "orbsvcs/Metrics/Metrics_FrameManager.h" #include "ace/Hash_Map_Manager.h" @@ -149,11 +149,11 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Metrics_UpcallMonitor_T.i" +#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Metrics_UpcallMonitor_T.cpp" +#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp index 2d7119cbc70..99c51fe77b7 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp @@ -9,8 +9,8 @@ #include "ace/Metrics_Cache.h" -#include "Metrics_Utils.h" -#include "Metrics_LocalCache.h" +#include "orbsvcs/Metrics/Metrics_Utils.h" +#include "orbsvcs/Metrics/Metrics_LocalCache.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -523,7 +523,7 @@ WSOA_Metrics_Handles::WSOA_Metrics_Handles () TAO_END_VERSIONED_NAMESPACE_DECL #if !defined (__ACE_INLINE__) -#include "Metrics_Utils.i" +#include "orbsvcs/Metrics/Metrics_Utils.i" #endif /* __ACE_INLINE__ */ #else diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h index c1679582ea1..5e0e0ebd36d 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h @@ -22,7 +22,7 @@ #include "ace/Singleton.h" #include "orbsvcs/RtecSchedulerC.h" #include "orbsvcs/MetricsC.h" -#include "metrics_export.h" +#include "orbsvcs/Metrics/metrics_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -178,7 +178,7 @@ METRICS_LOGGER_REF); \ TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Metrics_Utils.i" +#include "orbsvcs/Metrics/Metrics_Utils.i" #endif /* __ACE_INLINE__ */ #endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp index 58f7f949abd..bee9ae0c932 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp @@ -3,7 +3,7 @@ #ifndef TAO_BINDINGS_ITERATOR_T_CPP #define TAO_BINDINGS_ITERATOR_T_CPP -#include "Bindings_Iterator_T.h" +#include "orbsvcs/Naming/Bindings_Iterator_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h index 62f0e6f904b..6bed837d729 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h @@ -15,7 +15,7 @@ #define TAO_BINDINGS_ITERATOR_T_H #include /**/ "ace/pre.h" -#include "Hash_Naming_Context.h" +#include "orbsvcs/Naming/Hash_Naming_Context.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -134,7 +134,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Bindings_Iterator_T.cpp" +#include "orbsvcs/Naming/Bindings_Iterator_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp index 152ad33bdba..5fddba2a270 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp @@ -13,7 +13,7 @@ // // ============================================================================ -#include "Entries.h" +#include "orbsvcs/Naming/Entries.h" ACE_RCSID(Naming, Entries, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h index 2e1bd06242a..e41d9bdf258 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h @@ -24,7 +24,7 @@ #include "ace/SString.h" #include "orbsvcs/CosNamingC.h" -#include "naming_serv_export.h" +#include "orbsvcs/Naming/naming_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp index bdee7c2b85e..403e105bf7d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp @@ -3,7 +3,7 @@ //----------------------------------------------------------------------------- // Flat File class implementations //----------------------------------------------------------------------------- -#include "Flat_File_Persistence.h" +#include "orbsvcs/Naming/Flat_File_Persistence.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_sys_stat.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h index ccb2fcf4d3d..8c76dbc99a3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h @@ -13,7 +13,7 @@ #ifndef TAO_FLAT_FILE_PERSISTENCE_H #define TAO_FLAT_FILE_PERSISTENCE_H -#include "Storable.h" +#include "orbsvcs/Naming/Storable.h" #include "ace/OS_NS_stdio.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp index 3b0678d10ba..3cb59bd6da9 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp @@ -13,8 +13,8 @@ // // ============================================================================ -#include "Hash_Naming_Context.h" -#include "nsconf.h" +#include "orbsvcs/Naming/Hash_Naming_Context.h" +#include "orbsvcs/Naming/nsconf.h" #include "ace/Auto_Ptr.h" ACE_RCSID (Naming, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index 240435cc5a5..21fb9d571f3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -16,8 +16,8 @@ #include /**/ "ace/pre.h" -#include "Naming_Context_Interface.h" -#include "naming_serv_export.h" +#include "orbsvcs/Naming/Naming_Context_Interface.h" +#include "orbsvcs/Naming/naming_serv_export.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp index 49f700db6f0..8af72b358db 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Naming_Client.h" +#include "orbsvcs/Naming/Naming_Client.h" #include "orbsvcs/CosNamingC.h" #include "ace/Log_Msg.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp index 5350dc555cd..809c1795a42 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -13,7 +13,7 @@ // // ============================================================================ -#include "Naming_Context_Interface.h" +#include "orbsvcs/Naming/Naming_Context_Interface.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" #include "ace/os_include/os_ctype.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index 938adb3ef02..54140eb5e57 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -17,7 +17,7 @@ #include "orbsvcs/CosNamingS.h" -#include "naming_serv_export.h" +#include "orbsvcs/Naming/naming_serv_export.h" #include "ace/Null_Mutex.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index 69abd47a19e..6426cb81819 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -13,7 +13,7 @@ // Carlos O'Ryan <coryan@uci.edu> // ================================================================ -#include "Naming_Loader.h" +#include "orbsvcs/Naming/Naming_Loader.h" #include "ace/Dynamic_Service.h" #include "ace/Argv_Type_Converter.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index f70720e38cb..5ea0c3bbc03 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Naming_Server.h" -#include "Transient_Naming_Context.h" -#include "Persistent_Context_Index.h" -#include "Storable_Naming_Context.h" -#include "Storable_Naming_Context_Activator.h" -#include "Flat_File_Persistence.h" +#include "orbsvcs/Naming/Naming_Server.h" +#include "orbsvcs/Naming/Transient_Naming_Context.h" +#include "orbsvcs/Naming/Persistent_Context_Index.h" +#include "orbsvcs/Naming/Storable_Naming_Context.h" +#include "orbsvcs/Naming/Storable_Naming_Context_Activator.h" +#include "orbsvcs/Naming/Flat_File_Persistence.h" #include "orbsvcs/CosNamingC.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h index a7cf2d0b80b..5d7c3919fb6 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h @@ -23,8 +23,8 @@ #include "tao/ORB.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/IOR_Multicast.h" -#include "Naming_Context_Interface.h" -#include "nsconf.h" +#include "orbsvcs/Naming/Naming_Context_Interface.h" +#include "orbsvcs/Naming/nsconf.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp index 35a4737b125..a9d8fd2b50b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Naming_Service_Container.h" +#include "orbsvcs/Naming/Naming_Service_Container.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index fae171bd18f..97c2407a6bb 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Persistent_Context_Index.h" -#include "Persistent_Naming_Context.h" +#include "orbsvcs/Naming/Persistent_Context_Index.h" +#include "orbsvcs/Naming/Persistent_Naming_Context.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h index da12b2b1559..97bd7b76018 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h @@ -15,9 +15,9 @@ #define TAO_PERSISTENT_CONTEXT_INDEX_H #include /**/ "ace/pre.h" -#include "Persistent_Entries.h" -#include "naming_serv_export.h" -#include "nsconf.h" +#include "orbsvcs/Naming/Persistent_Entries.h" +#include "orbsvcs/Naming/naming_serv_export.h" +#include "orbsvcs/Naming/nsconf.h" #include "tao/PortableServer/PortableServer.h" #include "ace/Malloc_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp index c687e15deb7..f5d31b0874c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp @@ -13,7 +13,7 @@ // // ============================================================================ -#include "Persistent_Entries.h" +#include "orbsvcs/Naming/Persistent_Entries.h" #include "ace/SString.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h index 1dbbd10848e..d418414a945 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h @@ -17,7 +17,7 @@ #include "ace/Hash_Map_With_Allocator_T.h" #include "orbsvcs/CosNamingC.h" -#include "naming_serv_export.h" +#include "orbsvcs/Naming/naming_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp index 0aea6d2beaa..80b4a7f4aa7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp @@ -1,6 +1,6 @@ -#include "Persistent_Naming_Context.h" -#include "Persistent_Context_Index.h" -#include "Bindings_Iterator_T.h" +#include "orbsvcs/Naming/Persistent_Naming_Context.h" +#include "orbsvcs/Naming/Persistent_Context_Index.h" +#include "orbsvcs/Naming/Bindings_Iterator_T.h" #include "ace/OS_NS_stdio.h" // The following #pragma is needed to disable a warning that occurs diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h index b499ddf5161..4ad3b2e61c0 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h @@ -15,9 +15,9 @@ #define TAO_PERSISTENT_NAMING_CONTEXT_H #include /**/ "ace/pre.h" -#include "Hash_Naming_Context.h" -#include "Persistent_Entries.h" -#include "naming_serv_export.h" +#include "orbsvcs/Naming/Hash_Naming_Context.h" +#include "orbsvcs/Naming/Persistent_Entries.h" +#include "orbsvcs/Naming/naming_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp index 8fdb58357be..b04ee7c389d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp @@ -13,10 +13,10 @@ // // ============================================================================ -#include "Storable.h" +#include "orbsvcs/Naming/Storable.h" #if !defined (__ACE_INLINE__) -#include "Storable.inl" +#include "orbsvcs/Naming/Storable.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable.h b/TAO/orbsvcs/orbsvcs/Naming/Storable.h index 48248e02e1d..b21cf124b71 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.h @@ -159,7 +159,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Storable.inl" +#include "orbsvcs/Naming/Storable.inl" #endif /* __ACE_INLINE_ */ #endif /* TAO_NAMING_STORABLE_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index d09957d3af7..467086d3cd6 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -1,5 +1,5 @@ -#include "Storable_Naming_Context.h" -#include "Bindings_Iterator_T.h" +#include "orbsvcs/Naming/Storable_Naming_Context.h" +#include "orbsvcs/Naming/Bindings_Iterator_T.h" #include "tao/debug.h" @@ -1458,7 +1458,7 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many, TAO_END_VERSIONED_NAMESPACE_DECL -#include "Naming_Service_Container.h" +#include "orbsvcs/Naming/Naming_Service_Container.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h index 2d9e4a1388b..87f8bb203a2 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h @@ -14,11 +14,11 @@ #define TAO_STORABLE_NAMING_CONTEXT_H #include /**/ "ace/pre.h" -#include "Hash_Naming_Context.h" +#include "orbsvcs/Naming/Hash_Naming_Context.h" #include "ace/Hash_Map_Manager.h" #include "ace/Auto_Ptr.h" -#include "Storable.h" +#include "orbsvcs/Naming/Storable.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp index cb644d3f20e..b2bb63bf6cf 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp @@ -12,12 +12,12 @@ // // ============================================================================ -#include "Storable_Naming_Context_Activator.h" +#include "orbsvcs/Naming/Storable_Naming_Context_Activator.h" #if (TAO_HAS_MINIMUM_POA == 0) -#include "Naming_Context_Interface.h" -#include "Storable_Naming_Context.h" -#include "Storable.h" +#include "orbsvcs/Naming/Naming_Context_Interface.h" +#include "orbsvcs/Naming/Storable_Naming_Context.h" +#include "orbsvcs/Naming/Storable.h" #include "ace/Auto_Ptr.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h index c3cb664f6fa..d8799fd1137 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h @@ -25,7 +25,7 @@ #if (TAO_HAS_MINIMUM_POA == 0) -#include "naming_serv_export.h" +#include "orbsvcs/Naming/naming_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index 8d479154e75..06eb43a44b5 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -13,8 +13,8 @@ // // ============================================================================ #include "ace/Auto_Ptr.h" -#include "Transient_Naming_Context.h" -#include "Bindings_Iterator_T.h" +#include "orbsvcs/Naming/Transient_Naming_Context.h" +#include "orbsvcs/Naming/Bindings_Iterator_T.h" #include "ace/OS_NS_stdio.h" ACE_RCSID(Naming, Transient_Naming_Context, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h index adceb9f3e44..2c3de8a61f3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h @@ -15,8 +15,8 @@ #define TAO_TRANSIENT_NAMING_CONTEXT_H #include /**/ "ace/pre.h" -#include "Hash_Naming_Context.h" -#include "Entries.h" +#include "orbsvcs/Naming/Hash_Naming_Context.h" +#include "orbsvcs/Naming/Entries.h" #include "ace/Hash_Map_Manager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index 88181a83ae0..48a0a7d9de0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "Admin.h" +#include "orbsvcs/Notify/Admin.h" #if ! defined (__ACE_INLINE__) -#include "Admin.inl" +#include "orbsvcs/Notify/Admin.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Notify, @@ -11,16 +11,16 @@ ACE_RCSID (Notify, #include "orbsvcs/CosNotifyChannelAdminC.h" -#include "Container_T.h" -#include "Proxy.h" -#include "EventChannel.h" -#include "Topology_Saver.h" -#include "Save_Persist_Worker_T.h" -#include "Reconnect_Worker_T.h" -#include "Consumer_Map.h" -#include "Supplier_Map.h" -#include "ConsumerAdmin.h" -#include "SupplierAdmin.h" +#include "orbsvcs/Notify/Container_T.h" +#include "orbsvcs/Notify/Proxy.h" +#include "orbsvcs/Notify/EventChannel.h" +#include "orbsvcs/Notify/Topology_Saver.h" +#include "orbsvcs/Notify/Save_Persist_Worker_T.h" +#include "orbsvcs/Notify/Reconnect_Worker_T.h" +#include "orbsvcs/Notify/Consumer_Map.h" +#include "orbsvcs/Notify/Supplier_Map.h" +#include "orbsvcs/Notify/ConsumerAdmin.h" +#include "orbsvcs/Notify/SupplierAdmin.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h index ecad878497e..a7a9487c8c4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h @@ -14,16 +14,16 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "FilterAdmin.h" -#include "EventTypeSeq.h" -#include "Topology_Object.h" -#include "EventChannel.h" +#include "orbsvcs/Notify/FilterAdmin.h" +#include "orbsvcs/Notify/EventTypeSeq.h" +#include "orbsvcs/Notify/Topology_Object.h" +#include "orbsvcs/Notify/EventChannel.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -118,7 +118,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Admin.inl" +#include "orbsvcs/Notify/Admin.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp index 97315246fc0..37798f3088f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "AdminProperties.h" +#include "orbsvcs/Notify/AdminProperties.h" #if ! defined (__ACE_INLINE__) -#include "AdminProperties.inl" +#include "orbsvcs/Notify/AdminProperties.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Notify, diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h index 5f040b4cb85..163e22dc13c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h @@ -14,16 +14,16 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PropertySeq.h" -#include "Property_T.h" -#include "Property.h" -#include "Property_Boolean.h" +#include "orbsvcs/Notify/PropertySeq.h" +#include "orbsvcs/Notify/Property_T.h" +#include "orbsvcs/Notify/Property.h" +#include "orbsvcs/Notify/Property_Boolean.h" #include "tao/orbconf.h" @@ -125,7 +125,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "AdminProperties.inl" +#include "orbsvcs/Notify/AdminProperties.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h index 2167ac7b496..e7b1b61ea8a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h @@ -3,7 +3,7 @@ #define ALLOC_TRACKER_H #include /**/"ace/pre.h" -#include "notify_export.h" +#include "orbsvcs/Notify/notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp index ec6a9884266..30daf66889a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "AnyEvent.h" +#include "orbsvcs/Notify/Any/AnyEvent.h" ACE_RCSID (Notify, TAO_Notify_AnyEvent, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp index 3a7dee91941..10ef7f3cb8d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "CosEC_ProxyPushConsumer.h" +#include "orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h" ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushConsumer, "$Id$") @@ -8,8 +8,8 @@ ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushConsumer, "$Id$") #include "../AdminProperties.h" #include "../Method_Request_Lookup.h" #include "../Worker_Task.h" -#include "AnyEvent.h" -#include "PushSupplier.h" +#include "orbsvcs/Notify/Any/AnyEvent.h" +#include "orbsvcs/Notify/Any/PushSupplier.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp index 008de7aa779..694b6c378b5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "CosEC_ProxyPushSupplier.h" +#include "orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h" ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushSupplier, "$Id$") #include "tao/debug.h" -#include "PushConsumer.h" +#include "orbsvcs/Notify/Any/PushConsumer.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp index 4933b4960d0..d18b75d6134 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "ProxyPushConsumer.h" +#include "orbsvcs/Notify/Any/ProxyPushConsumer.h" ACE_RCSID (Notify, TAO_Notify_ProxyPushConsumer, "$Id$") #include "tao/debug.h" #include "../AdminProperties.h" #include "../Properties.h" -#include "AnyEvent.h" -#include "PushSupplier.h" +#include "orbsvcs/Notify/Any/AnyEvent.h" +#include "orbsvcs/Notify/Any/PushSupplier.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp index 4bd2c3d6109..3faad6cd0f9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "ProxyPushSupplier.h" +#include "orbsvcs/Notify/Any/ProxyPushSupplier.h" ACE_RCSID (Notify, TAO_Notify_ProxyPushSupplier, "$Id$") #include "tao/debug.h" -#include "PushConsumer.h" +#include "orbsvcs/Notify/Any/PushConsumer.h" #include "../Properties.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp index 95510ae4b28..c201189b499 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "PushConsumer.h" +#include "orbsvcs/Notify/Any/PushConsumer.h" ACE_RCSID (Notify, TAO_Notify_PushConsumer, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp index 5ddb4f26c0a..c122257314a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "PushSupplier.h" +#include "orbsvcs/Notify/Any/PushSupplier.h" ACE_RCSID (Notify, TAO_Notify_PushSupplier, "$Id$") #include "../Properties.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp index 96f213d97d4..fd77791b525 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Bit_Vector.h" +#include "orbsvcs/Notify/Bit_Vector.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h index 0dde1374969..46f668814bf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h @@ -16,7 +16,7 @@ #define BIT_VECTOR_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index 41ea446a511..08b6a810187 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "Buffering_Strategy.h" +#include "orbsvcs/Notify/Buffering_Strategy.h" ACE_RCSID (Notify, Buffering_Strategy, "$Id$") -#include "Method_Request.h" -#include "Notify_Extensions.h" -#include "QoSProperties.h" -#include "Notify_Extensions.h" +#include "orbsvcs/Notify/Method_Request.h" +#include "orbsvcs/Notify/Notify_Extensions.h" +#include "orbsvcs/Notify/QoSProperties.h" +#include "orbsvcs/Notify/Notify_Extensions.h" #include "orbsvcs/CosNotificationC.h" #include "orbsvcs/Time_Utilities.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h index ad73fcb0553..7baa636a2d9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,9 +25,9 @@ #include "orbsvcs/TimeBaseC.h" -#include "Property.h" -#include "Property_T.h" -#include "AdminProperties.h" +#include "orbsvcs/Notify/Property.h" +#include "orbsvcs/Notify/Property_T.h" +#include "orbsvcs/Notify/AdminProperties.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp index 88800ed0d99..bd0d3a7eec8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp @@ -1,5 +1,5 @@ // $Id$ -#include "Builder.h" +#include "orbsvcs/Notify/Builder.h" ACE_RCSID (Notify, Builder, @@ -9,21 +9,21 @@ ACE_RCSID (Notify, #include "tao/PortableServer/PortableServerC.h" -#include "Factory.h" -#include "Properties.h" -#include "POA_Helper.h" -#include "ID_Factory.h" -#include "EventChannelFactory.h" -#include "EventChannel.h" -#include "SupplierAdmin.h" -#include "ConsumerAdmin.h" -#include "Worker_Task.h" -#include "Reactive_Task.h" -#include "ThreadPool_Task.h" -#include "FilterFactory.h" -#include "Object.h" -#include "EventType.h" -#include "Event.h" +#include "orbsvcs/Notify/Factory.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/POA_Helper.h" +#include "orbsvcs/Notify/ID_Factory.h" +#include "orbsvcs/Notify/EventChannelFactory.h" +#include "orbsvcs/Notify/EventChannel.h" +#include "orbsvcs/Notify/SupplierAdmin.h" +#include "orbsvcs/Notify/ConsumerAdmin.h" +#include "orbsvcs/Notify/Worker_Task.h" +#include "orbsvcs/Notify/Reactive_Task.h" +#include "orbsvcs/Notify/ThreadPool_Task.h" +#include "orbsvcs/Notify/FilterFactory.h" +#include "orbsvcs/Notify/Object.h" +#include "orbsvcs/Notify/EventType.h" +#include "orbsvcs/Notify/Event.h" #include "Any/AnyEvent.h" #include "Any/ProxyPushConsumer.h" #include "Any/ProxyPushSupplier.h" @@ -33,8 +33,8 @@ ACE_RCSID (Notify, #include "Structured/StructuredProxyPushSupplier.h" #include "Sequence/SequenceProxyPushConsumer.h" #include "Sequence/SequenceProxyPushSupplier.h" -#include "ETCL_FilterFactory.h" -#include "Container_T.h" +#include "orbsvcs/Notify/ETCL_FilterFactory.h" +#include "orbsvcs/Notify/Container_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h index 577ed4a9481..7ed2c219c65 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,8 +23,8 @@ #include "orbsvcs/CosNotifyChannelAdminC.h" #include "orbsvcs/NotifyExtC.h" -#include "AdminProperties.h" -#include "Topology_Object.h" +#include "orbsvcs/Notify/AdminProperties.h" +#include "orbsvcs/Notify/Topology_Object.h" #include "tao/PortableServer/PortableServer.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp index a7e45f8c959..7b19b418ebc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp @@ -1,16 +1,16 @@ // $Id$ -#include "Consumer.h" +#include "orbsvcs/Notify/Consumer.h" #if ! defined (__ACE_INLINE__) -#include "Consumer.inl" +#include "orbsvcs/Notify/Consumer.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (RT_Notify, TAO_Notify_Consumer, "$Id$") -#include "Timer.h" -#include "ProxySupplier.h" -#include "Method_Request_Event.h" +#include "orbsvcs/Notify/Timer.h" +#include "orbsvcs/Notify/ProxySupplier.h" +#include "orbsvcs/Notify/Method_Request_Event.h" #include "orbsvcs/Time_Utilities.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h index 9622c1be22e..43b591b51e4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,9 +23,9 @@ #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/CosNotificationC.h" -#include "Peer.h" -#include "Event.h" -#include "Timer.h" +#include "orbsvcs/Notify/Peer.h" +#include "orbsvcs/Notify/Event.h" +#include "orbsvcs/Notify/Timer.h" #include "ace/Event_Handler.h" @@ -187,7 +187,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Consumer.inl" +#include "orbsvcs/Notify/Consumer.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 92fcd7882b2..7b10e3bd40b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -1,20 +1,20 @@ // $Id$ -#include "ConsumerAdmin.h" +#include "orbsvcs/Notify/ConsumerAdmin.h" ACE_RCSID (RT_Notify, TAO_Notify_ConsumerAdmin, "$Id$") -#include "Subscription_Change_Worker.h" -#include "Proxy.h" -#include "EventChannel.h" -#include "Properties.h" -#include "Factory.h" -#include "Builder.h" -#include "Find_Worker_T.h" -#include "Seq_Worker_T.h" -#include "ProxySupplier.h" +#include "orbsvcs/Notify/Subscription_Change_Worker.h" +#include "orbsvcs/Notify/Proxy.h" +#include "orbsvcs/Notify/EventChannel.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/Factory.h" +#include "orbsvcs/Notify/Builder.h" +#include "orbsvcs/Notify/Find_Worker_T.h" +#include "orbsvcs/Notify/Seq_Worker_T.h" +#include "orbsvcs/Notify/ProxySupplier.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h index 85723b1fbd5..a0c3c3b00a5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +22,7 @@ #include "orbsvcs/NotifyExtS.h" -#include "Admin.h" +#include "orbsvcs/Notify/Admin.h" class TAO_Notify_ProxySupplier; #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h index bd9fdc4ce47..eec7e570347 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h @@ -14,15 +14,15 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Event_Map_T.h" -#include "ProxySupplier.h" +#include "orbsvcs/Notify/Event_Map_T.h" +#include "orbsvcs/Notify/ProxySupplier.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp index e8a0fa4aea4..3656e3dca86 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp @@ -3,17 +3,17 @@ #ifndef TAO_Notify_CONTAINER_T_CPP #define TAO_Notify_CONTAINER_T_CPP -#include "Container_T.h" +#include "orbsvcs/Notify/Container_T.h" -#include "Properties.h" -#include "Factory.h" -#include "POA_Helper.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/Factory.h" +#include "orbsvcs/Notify/POA_Helper.h" #include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) -#include "Container_T.inl" +#include "orbsvcs/Notify/Container_T.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h index f94332d50b9..9c06930d1b2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -66,11 +66,11 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Container_T.inl" +#include "orbsvcs/Notify/Container_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Container_T.cpp" +#include "orbsvcs/Notify/Container_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp index 563113ea853..86d6e46106a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "CosNotify_Initializer.h" +#include "orbsvcs/Notify/CosNotify_Initializer.h" ACE_RCSID(Notify, TAO_Notify_CosNotify_Initializer, "$Id$") -#include "CosNotify_Service.h" +#include "orbsvcs/Notify/CosNotify_Service.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h index 1326a04c83e..ce08ffd76eb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h @@ -13,7 +13,7 @@ #define TAO_Notify_COSNOTIFY_INITIALIZER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index 967ed9c00c0..efeb532fa99 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "CosNotify_Service.h" -#include "Properties.h" -#include "Default_Factory.h" -#include "Builder.h" +#include "orbsvcs/Notify/CosNotify_Service.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/Default_Factory.h" +#include "orbsvcs/Notify/Builder.h" #include "ace/Sched_Params.h" #include "ace/Arg_Shifter.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h index c250a51aa8f..cc91e77d372 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h @@ -13,15 +13,15 @@ #define TAO_Notify_COSNOTIFY_SERVICE_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Service.h" -#include "Builder.h" -#include "Factory.h" +#include "orbsvcs/Notify/Service.h" +#include "orbsvcs/Notify/Builder.h" +#include "orbsvcs/Notify/Factory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp index 08d09a9f0e8..de859728f76 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "Default_Factory.h" +#include "orbsvcs/Notify/Default_Factory.h" ACE_RCSID (Notify, TAO_Notify_Default_Factory, "$Id$") -#include "EventChannelFactory.h" -#include "EventChannel.h" -#include "Admin.h" -#include "Proxy.h" -#include "SupplierAdmin.h" -#include "ConsumerAdmin.h" +#include "orbsvcs/Notify/EventChannelFactory.h" +#include "orbsvcs/Notify/EventChannel.h" +#include "orbsvcs/Notify/Admin.h" +#include "orbsvcs/Notify/Proxy.h" +#include "orbsvcs/Notify/SupplierAdmin.h" +#include "orbsvcs/Notify/ConsumerAdmin.h" #include "Structured/StructuredProxyPushConsumer.h" #include "Structured/StructuredProxyPushSupplier.h" #include "Any/ProxyPushConsumer.h" @@ -20,7 +20,7 @@ ACE_RCSID (Notify, #include "Any/CosEC_ProxyPushSupplier.h" #include "Sequence/SequenceProxyPushConsumer.h" #include "Sequence/SequenceProxyPushSupplier.h" -#include "Supplier.h" +#include "orbsvcs/Notify/Supplier.h" #include "orbsvcs/ESF/ESF_Proxy_List.h" #include "orbsvcs/ESF/ESF_Copy_On_Write.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h index 5eaf34e1620..106d7cb265d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h @@ -13,13 +13,13 @@ #define TAO_Notify_DEFAULT_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Factory.h" +#include "orbsvcs/Notify/Factory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp index b70be939804..a40986b1a0c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "Delivery_Request.h" +#include "orbsvcs/Notify/Delivery_Request.h" #if ! defined (__ACE_INLINE__) -#include "Delivery_Request.inl" +#include "orbsvcs/Notify/Delivery_Request.inl" #endif /* __ACE_INLINE__ */ -#include "Routing_Slip.h" +#include "orbsvcs/Notify/Routing_Slip.h" #include "tao/debug.h" #include "tao/corba.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h index 7665c0059f7..744bca7d733 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h @@ -5,9 +5,9 @@ #define TAO_NOTIFY_DELIVERY_REQUEST_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" -#include "Topology_Object.h" -#include "Event.h" +#include "orbsvcs/Notify/notify_serv_export.h" +#include "orbsvcs/Notify/Topology_Object.h" +#include "orbsvcs/Notify/Event.h" #include <ace/Vector_T.h> #include <ace/Bound_Ptr.h> #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -128,7 +128,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Delivery_Request.inl" +#include "orbsvcs/Notify/Delivery_Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp index fac82881a5a..51f51b190c1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "ETCL_Filter.h" +#include "orbsvcs/Notify/ETCL_Filter.h" ACE_RCSID(Notify, TAO_Notify_ETCL_Filter, "$Id$") #include "ace/Auto_Ptr.h" #include "tao/debug.h" -#include "Notify_Constraint_Visitors.h" +#include "orbsvcs/Notify/Notify_Constraint_Visitors.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index 8cc45776151..918bc8ca6e6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -13,7 +13,7 @@ #define TAO_Notify_ETCL_FILTER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,7 +23,7 @@ #include "ace/Hash_Map_Manager.h" #include "ace/Atomic_Op.h" #include "orbsvcs/CosNotifyFilterS.h" -#include "Notify_Constraint_Interpreter.h" +#include "orbsvcs/Notify/Notify_Constraint_Interpreter.h" #include "ace/Null_Mutex.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index 347c3730a59..25d53cd5370 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "ETCL_FilterFactory.h" +#include "orbsvcs/Notify/ETCL_FilterFactory.h" ACE_RCSID(Notify, TAO_Notify_ETCL_FilterFactory, "$Id$") -#include "ETCL_Filter.h" +#include "orbsvcs/Notify/ETCL_Filter.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h index 74b400f2b13..615f010c0cd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +22,7 @@ #include "orbsvcs/CosNotifyFilterS.h" -#include "FilterFactory.h" +#include "orbsvcs/Notify/FilterFactory.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp index 927245c7b01..05b0db1fc44 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Event.h" +#include "orbsvcs/Notify/Event.h" #if ! defined (__ACE_INLINE__) -#include "Event.inl" +#include "orbsvcs/Notify/Event.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Notify, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h index 5c77f00ac69..1b44711ce46 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h @@ -14,16 +14,16 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Refcountable.h" -#include "Property.h" -#include "Property_Boolean.h" -#include "Property_T.h" +#include "orbsvcs/Notify/Refcountable.h" +#include "orbsvcs/Notify/Property.h" +#include "orbsvcs/Notify/Property_Boolean.h" +#include "orbsvcs/Notify/Property_T.h" #include "orbsvcs/Event_ForwarderS.h" #include "orbsvcs/CosNotifyFilterC.h" @@ -131,7 +131,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Event.inl" +#include "orbsvcs/Notify/Event.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index a034bb2b158..a55f5e44f6c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -1,22 +1,22 @@ // $Id$ -#include "EventChannel.h" - -#include "Container_T.h" -#include "EventChannelFactory.h" -#include "ConsumerAdmin.h" -#include "SupplierAdmin.h" -#include "Properties.h" -#include "Factory.h" -#include "Builder.h" -#include "Find_Worker_T.h" -#include "Seq_Worker_T.h" -#include "Topology_Saver.h" -#include "Save_Persist_Worker_T.h" -#include "Reconnect_Worker_T.h" -#include "Proxy.h" -#include "Event_Manager.h" -#include "POA_Helper.h" +#include "orbsvcs/Notify/EventChannel.h" + +#include "orbsvcs/Notify/Container_T.h" +#include "orbsvcs/Notify/EventChannelFactory.h" +#include "orbsvcs/Notify/ConsumerAdmin.h" +#include "orbsvcs/Notify/SupplierAdmin.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/Factory.h" +#include "orbsvcs/Notify/Builder.h" +#include "orbsvcs/Notify/Find_Worker_T.h" +#include "orbsvcs/Notify/Seq_Worker_T.h" +#include "orbsvcs/Notify/Topology_Saver.h" +#include "orbsvcs/Notify/Save_Persist_Worker_T.h" +#include "orbsvcs/Notify/Reconnect_Worker_T.h" +#include "orbsvcs/Notify/Proxy.h" +#include "orbsvcs/Notify/Event_Manager.h" +#include "orbsvcs/Notify/POA_Helper.h" #include "tao/debug.h" //#define DEBUG_LEVEL 9 diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h index c0652d7fd0d..2fe1c13ff05 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h @@ -14,16 +14,16 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/CosNotifyChannelAdminS.h" -#include "Topology_Object.h" -#include "Object.h" -#include "EventChannelFactory.h" +#include "orbsvcs/Notify/Topology_Object.h" +#include "orbsvcs/Notify/Object.h" +#include "orbsvcs/Notify/EventChannelFactory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp index 7255e7412f1..2cf855c3009 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp @@ -1,23 +1,23 @@ // $Id$ -#include "EventChannelFactory.h" +#include "orbsvcs/Notify/EventChannelFactory.h" ACE_RCSID(Notify, TAO_Notify_EventChannelFactory, "$Id$") -#include "Properties.h" -#include "Factory.h" -#include "Builder.h" -#include "Topology_Saver.h" -#include "Topology_Loader.h" -#include "Save_Persist_Worker_T.h" -#include "Reconnect_Worker_T.h" -#include "Event_Persistence_Strategy.h" -#include "Routing_Slip_Persistence_Manager.h" -#include "EventChannel.h" -#include "Container_T.h" -#include "Find_Worker_T.h" -#include "Seq_Worker_T.h" -#include "POA_Helper.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/Factory.h" +#include "orbsvcs/Notify/Builder.h" +#include "orbsvcs/Notify/Topology_Saver.h" +#include "orbsvcs/Notify/Topology_Loader.h" +#include "orbsvcs/Notify/Save_Persist_Worker_T.h" +#include "orbsvcs/Notify/Reconnect_Worker_T.h" +#include "orbsvcs/Notify/Event_Persistence_Strategy.h" +#include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h" +#include "orbsvcs/Notify/EventChannel.h" +#include "orbsvcs/Notify/Container_T.h" +#include "orbsvcs/Notify/Find_Worker_T.h" +#include "orbsvcs/Notify/Seq_Worker_T.h" +#include "orbsvcs/Notify/POA_Helper.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h index 46932dac6ce..be559fae20a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h @@ -14,16 +14,16 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Topology_Object.h" -#include "Topology_Factory.h" -#include "Reconnection_Registry.h" -#include "Routing_Slip.h" +#include "orbsvcs/Notify/Topology_Object.h" +#include "orbsvcs/Notify/Topology_Factory.h" +#include "orbsvcs/Notify/Reconnection_Registry.h" +#include "orbsvcs/Notify/Routing_Slip.h" #include "orbsvcs/CosNotifyChannelAdminS.h" #include "orbsvcs/NotifyExtS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp index bf03df1d492..e86593e9583 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp @@ -1,16 +1,16 @@ // $Id$ -#include "EventType.h" +#include "orbsvcs/Notify/EventType.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" #if ! defined (__ACE_INLINE__) -#include "EventType.inl" +#include "orbsvcs/Notify/EventType.inl" #endif /* __ACE_INLINE__ */ -#include "Topology_Saver.h" +#include "orbsvcs/Notify/Topology_Saver.h" ACE_RCSID (Notify, TAO_Notify_EventType, diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h index ce3ff095665..d6ba4bd1033 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h @@ -14,14 +14,14 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/CosNotificationC.h" -#include "Topology_Object.h" +#include "orbsvcs/Notify/Topology_Object.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -99,7 +99,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "EventType.inl" +#include "orbsvcs/Notify/EventType.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp index ac9e171dfb1..4c44429d454 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "EventTypeSeq.h" -#include "Topology_Saver.h" +#include "orbsvcs/Notify/EventTypeSeq.h" +#include "orbsvcs/Notify/Topology_Saver.h" #include "tao/debug.h" //#define DEBUG_LEVEL 9 diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h index e9f6aa50935..cf66b603c04 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h @@ -13,13 +13,13 @@ #define TAO_Notify_EVENTTYPESEQ_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "EventType.h" +#include "orbsvcs/Notify/EventType.h" #include "ace/Unbounded_Set.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp index 94dfe9b99be..35264373bd4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "Event_Manager.h" +#include "orbsvcs/Notify/Event_Manager.h" ACE_RCSID(Notify, TAO_Notify_Event_Manager, "$Id$") -#include "ProxyConsumer.h" -#include "ProxySupplier.h" -#include "Consumer_Map.h" -#include "Supplier_Map.h" -#include "Event_Map_T.h" +#include "orbsvcs/Notify/ProxyConsumer.h" +#include "orbsvcs/Notify/ProxySupplier.h" +#include "orbsvcs/Notify/Consumer_Map.h" +#include "orbsvcs/Notify/Supplier_Map.h" +#include "orbsvcs/Notify/Event_Map_T.h" #include "orbsvcs/ESF/ESF_Worker.h" #include "orbsvcs/ESF/ESF_Proxy_Collection.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h index f5dea3a1df1..ee897512072 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h @@ -15,9 +15,9 @@ #include /**/ "ace/pre.h" #include "ace/Auto_Ptr.h" -#include "Refcountable.h" +#include "orbsvcs/Notify/Refcountable.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp index 0f8f0384227..5488c3ad420 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp @@ -3,10 +3,10 @@ #ifndef TAO_Notify_EVENT_MAP_ENTRY_CPP #define TAO_Notify_EVENT_MAP_ENTRY_CPP -#include "Event_Map_Entry_T.h" +#include "orbsvcs/Notify/Event_Map_Entry_T.h" #if ! defined (__ACE_INLINE__) -#include "Event_Map_Entry_T.inl" +#include "orbsvcs/Notify/Event_Map_Entry_T.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Notify, @@ -14,8 +14,8 @@ ACE_RCSID (Notify, "$Id$") #include "orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "Properties.h" -#include "Factory.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/Factory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h index da977c98eb7..e362f9a7efb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -85,11 +85,11 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Event_Map_Entry_T.inl" +#include "orbsvcs/Notify/Event_Map_Entry_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Event_Map_Entry_T.cpp" +#include "orbsvcs/Notify/Event_Map_Entry_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp index 2864d140322..121d1f51fd0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp @@ -3,14 +3,14 @@ #ifndef TAO_Notify_EVENT_MAP_T_CPP #define TAO_Notify_EVENT_MAP_T_CPP -#include "Event_Map_T.h" +#include "orbsvcs/Notify/Event_Map_T.h" #include "orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "Event_Map_Entry_T.h" -#include "Properties.h" -#include "Factory.h" +#include "orbsvcs/Notify/Event_Map_Entry_T.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/Factory.h" #if ! defined (__ACE_INLINE__) -#include "Event_Map_T.inl" +#include "orbsvcs/Notify/Event_Map_T.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h index d7e2093f441..011cb6530da 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h @@ -13,7 +13,7 @@ #define TAO_Notify_EVENT_MAP_T_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,9 +22,9 @@ #include "ace/Hash_Map_Manager.h" #include "ace/CORBA_macros.h" -#include "EventType.h" -#include "Event_Map_Entry_T.h" -#include "EventTypeSeq.h" +#include "orbsvcs/Notify/EventType.h" +#include "orbsvcs/Notify/Event_Map_Entry_T.h" +#include "orbsvcs/Notify/EventTypeSeq.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -108,11 +108,11 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Event_Map_T.inl" +#include "orbsvcs/Notify/Event_Map_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Event_Map_T.cpp" +#include "orbsvcs/Notify/Event_Map_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp index afc13dd1d59..3caa8a0c5a1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp @@ -1,4 +1,4 @@ -#include "Event_Persistence_Factory.h" +#include "orbsvcs/Notify/Event_Persistence_Factory.h" ACE_RCSID (Notify, Event_Persistence_Factory, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h index 4466b34a59a..0abc936b92a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h @@ -16,7 +16,7 @@ #define EVENT_PERSISTENCE_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h index f60de846ab7..51019bac62a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h @@ -16,7 +16,7 @@ #define EVENT_PERSISTENCE_STRATEGY_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp index 99c87cb9f66..81b86902a36 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp @@ -1,15 +1,15 @@ /* -*- C++ -*- $Id$ */ -#include "FilterAdmin.h" +#include "orbsvcs/Notify/FilterAdmin.h" #if ! defined (__ACE_INLINE__) -#include "FilterAdmin.inl" +#include "orbsvcs/Notify/FilterAdmin.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, FilterAdmin, "$Id$") -#include "Topology_Saver.h" -#include "Properties.h" +#include "orbsvcs/Notify/Topology_Saver.h" +#include "orbsvcs/Notify/Properties.h" #include "ace/Bound_Ptr.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h index 4734d0ef88c..dfa0d7eb7af 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h @@ -20,10 +20,10 @@ #include "ace/Hash_Map_Manager.h" -#include "ID_Factory.h" -#include "Event.h" -#include "notify_serv_export.h" -#include "Topology_Object.h" +#include "orbsvcs/Notify/ID_Factory.h" +#include "orbsvcs/Notify/Event.h" +#include "orbsvcs/Notify/notify_serv_export.h" +#include "orbsvcs/Notify/Topology_Object.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -109,7 +109,7 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "FilterAdmin.inl" +#include "orbsvcs/Notify/FilterAdmin.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h index 79ef939b85b..a806f8d9437 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp index e85abd4ed04..de2822ae61b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp @@ -3,10 +3,10 @@ #ifndef TAO_Notify_FIND_WORKER_T_CPP #define TAO_Notify_FIND_WORKER_T_CPP -#include "Find_Worker_T.h" +#include "orbsvcs/Notify/Find_Worker_T.h" #if ! defined (__ACE_INLINE__) -#include "Find_Worker_T.inl" +#include "orbsvcs/Notify/Find_Worker_T.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h index 1f658254903..c9c09eca0fa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h @@ -13,7 +13,7 @@ #define TAO_Notify_FIND_WORKER_T_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -21,8 +21,8 @@ #include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "orbsvcs/ESF/ESF_Worker.h" -#include "Container_T.h" -#include "Object.h" +#include "orbsvcs/Notify/Container_T.h" +#include "orbsvcs/Notify/Object.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -62,11 +62,11 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Find_Worker_T.inl" +#include "orbsvcs/Notify/Find_Worker_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Find_Worker_T.cpp" +#include "orbsvcs/Notify/Find_Worker_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp index 00159c0fec7..71f0721ee0e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "ID_Factory.h" +#include "orbsvcs/Notify/ID_Factory.h" #if ! defined (__ACE_INLINE__) -#include "ID_Factory.inl" +#include "orbsvcs/Notify/ID_Factory.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_ID_Factory, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h index 2a8d9f0fa3c..f6596be8410 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,7 +22,7 @@ #include "ace/Atomic_Op.h" -#include "Object.h" +#include "orbsvcs/Notify/Object.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -54,7 +54,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ID_Factory.inl" +#include "orbsvcs/Notify/ID_Factory.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp index eef481b54cf..e9dc45dbb07 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Method_Request.h" +#include "orbsvcs/Notify/Method_Request.h" #include "orbsvcs/Time_Utilities.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h index cda7ffe2900..271c2d721b4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,7 +23,7 @@ #include "ace/Bound_Ptr.h" #include "ace/OS_NS_sys_time.h" -#include "Event.h" +#include "orbsvcs/Notify/Event.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp index f9f3e890c6e..af503aa3077 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "Method_Request_Dispatch.h" +#include "orbsvcs/Notify/Method_Request_Dispatch.h" ACE_RCSID(Notify, TAO_Notify_Method_Request_Dispatch, "$Id$") -#include "ProxySupplier.h" -#include "Consumer.h" -#include "Admin.h" -#include "ConsumerAdmin.h" -#include "EventChannelFactory.h" +#include "orbsvcs/Notify/ProxySupplier.h" +#include "orbsvcs/Notify/Consumer.h" +#include "orbsvcs/Notify/Admin.h" +#include "orbsvcs/Notify/ConsumerAdmin.h" +#include "orbsvcs/Notify/EventChannelFactory.h" #include "tao/debug.h" #include "tao/CDR.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h index 47fca8a136f..fed8d063cfa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h @@ -12,17 +12,17 @@ #define TAO_Notify_DISPATCH_METHOD_REQUEST_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Method_Request.h" -#include "Refcountable.h" -#include "Method_Request_Event.h" -#include "ProxySupplier.h" -#include "Delivery_Request.h" +#include "orbsvcs/Notify/Method_Request.h" +#include "orbsvcs/Notify/Refcountable.h" +#include "orbsvcs/Notify/Method_Request_Event.h" +#include "orbsvcs/Notify/ProxySupplier.h" +#include "orbsvcs/Notify/Delivery_Request.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp index 9ade4cd5524..53ab33da14c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Method_Request_Event.h" -#include "Delivery_Request.h" +#include "orbsvcs/Notify/Method_Request_Event.h" +#include "orbsvcs/Notify/Delivery_Request.h" ACE_RCSID (Notify, TAO_Notify_Method_Request_Event_Queueable, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h index 1585a7203ed..4acb97f10d9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h @@ -12,18 +12,18 @@ #define TAO_Notify_METHOD_REQUEST_EVENT_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Method_Request.h" -#include "Event.h" -#include "ProxySupplier.h" +#include "orbsvcs/Notify/Method_Request.h" +#include "orbsvcs/Notify/Event.h" +#include "orbsvcs/Notify/ProxySupplier.h" #include "tao/Basic_Types.h" #include "ace/CORBA_macros.h" -#include "Delivery_Request.h" +#include "orbsvcs/Notify/Delivery_Request.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp index 629f3ca4f9b..bee058ab534 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp @@ -1,20 +1,20 @@ // $Id$ -#include "Method_Request_Lookup.h" +#include "orbsvcs/Notify/Method_Request_Lookup.h" ACE_RCSID(Notify, TAO_Notify_Method_Request_Lookup, "$Id$") -#include "Consumer_Map.h" -#include "ProxySupplier.h" -#include "ProxyConsumer.h" -#include "Proxy.h" -#include "Admin.h" -#include "SupplierAdmin.h" -#include "Method_Request_Dispatch.h" -#include "Delivery_Request.h" -#include "EventChannelFactory.h" -#include "Event_Manager.h" -#include "Factory.h" +#include "orbsvcs/Notify/Consumer_Map.h" +#include "orbsvcs/Notify/ProxySupplier.h" +#include "orbsvcs/Notify/ProxyConsumer.h" +#include "orbsvcs/Notify/Proxy.h" +#include "orbsvcs/Notify/Admin.h" +#include "orbsvcs/Notify/SupplierAdmin.h" +#include "orbsvcs/Notify/Method_Request_Dispatch.h" +#include "orbsvcs/Notify/Delivery_Request.h" +#include "orbsvcs/Notify/EventChannelFactory.h" +#include "orbsvcs/Notify/Event_Manager.h" +#include "orbsvcs/Notify/Factory.h" #include "orbsvcs/ESF/ESF_Proxy_Collection.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h index 599590a10ee..d54bb62833e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h @@ -11,18 +11,18 @@ #define TAO_Notify_LOOKUP_METHOD_REQUEST_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/ESF/ESF_Worker.h" -#include "Method_Request_Event.h" -#include "ProxySupplier.h" -#include "ProxyConsumer.h" -#include "Consumer_Map.h" -#include "Delivery_Request.h" +#include "orbsvcs/Notify/Method_Request_Event.h" +#include "orbsvcs/Notify/ProxySupplier.h" +#include "orbsvcs/Notify/ProxyConsumer.h" +#include "orbsvcs/Notify/Consumer_Map.h" +#include "orbsvcs/Notify/Delivery_Request.h" #include "orbsvcs/ESF/ESF_Worker.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp index d021d9864c4..74ca99ef829 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Method_Request_Shutdown.h" -#include "ThreadPool_Task.h" +#include "orbsvcs/Notify/Method_Request_Shutdown.h" +#include "orbsvcs/Notify/ThreadPool_Task.h" ACE_RCSID(Notify, TAO_Notify_Method_Request_Shutdown, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h index 2d3e0031fae..af38f816524 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h @@ -14,13 +14,13 @@ #define TAO_Notify_METHOD_REQUEST_SHUTDOWN_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Method_Request.h" +#include "orbsvcs/Notify/Method_Request.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp index ea89a320be5..18ac5fa1841 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "Method_Request_Updates.h" +#include "orbsvcs/Notify/Method_Request_Updates.h" ACE_RCSID(Notify, TAO_Notify_Method_Request_Updates, "$Id$") #include "tao/debug.h" -#include "Proxy.h" -#include "Peer.h" +#include "orbsvcs/Notify/Proxy.h" +#include "orbsvcs/Notify/Peer.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h index f33e3768aa8..b9410188772 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h @@ -12,16 +12,16 @@ #define TAO_Notify_METHOD_REQUEST_UPDATES_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Method_Request_Updates_T.h" -#include "Method_Request.h" -#include "EventTypeSeq.h" -#include "Proxy.h" +#include "orbsvcs/Notify/Method_Request_Updates_T.h" +#include "orbsvcs/Notify/Method_Request.h" +#include "orbsvcs/Notify/EventTypeSeq.h" +#include "orbsvcs/Notify/Proxy.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp index 93482611387..19db54e852f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp @@ -3,10 +3,10 @@ #ifndef TAO_Notify_Method_Request_Updates_T_CPP #define TAO_Notify_Method_Request_Updates_T_CPP -#include "Method_Request_Updates_T.h" +#include "orbsvcs/Notify/Method_Request_Updates_T.h" #if ! defined (__ACE_INLINE__) -#include "Method_Request_Updates_T.inl" +#include "orbsvcs/Notify/Method_Request_Updates_T.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h index 3a88d7c6131..53b6c1d7b30 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -65,11 +65,11 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Method_Request_Updates_T.inl" +#include "orbsvcs/Notify/Method_Request_Updates_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Method_Request_Updates_T.cpp" +#include "orbsvcs/Notify/Method_Request_Updates_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl index 3d55289bbe1..657b6dd0929 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl @@ -3,7 +3,7 @@ // $Id$ #include "tao/debug.h" -#include "Peer.h" +#include "orbsvcs/Notify/Peer.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp index 67e0f59257e..7d1109eb65e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Name_Value_Pair.h" -#include "Property_T.h" +#include "orbsvcs/Notify/Name_Value_Pair.h" +#include "orbsvcs/Notify/Property_T.h" #include "ace/OS_String.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h index afd5a3bef11..6aa695f0e4a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h @@ -14,9 +14,9 @@ #define NAME_VALUE_PAIR_H #include /**/ "ace/pre.h" -#include "Property.h" -#include "Property_Boolean.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/Property.h" +#include "orbsvcs/Notify/Property_Boolean.h" +#include "orbsvcs/Notify/notify_serv_export.h" #include "ace/SString.h" #include "ace/Vector_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp index 214d4b44764..5d6f3e11e21 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Notify_Constraint_Interpreter.h" -#include "Notify_Constraint_Visitors.h" +#include "orbsvcs/Notify/Notify_Constraint_Interpreter.h" +#include "orbsvcs/Notify/Notify_Constraint_Visitors.h" ACE_RCSID(Notify, NS_Constraint_Interpreter, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h index 793c925db31..acb7c8b9d86 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -23,7 +23,7 @@ #include "orbsvcs/ETCL/ETCL_Constraint.h" #include "orbsvcs/CosNotifyFilterC.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index 6dbcc6537c1..2926a97483e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Notify_Constraint_Visitors.h" +#include "orbsvcs/Notify/Notify_Constraint_Visitors.h" #include "orbsvcs/ETCL/ETCL_Constraint.h" #include "orbsvcs/ETCL/ETCL_y.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h index b0445135a64..2033737b4ec 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -28,7 +28,7 @@ #include "orbsvcs/ETCL/ETCL_Constraint.h" #include "orbsvcs/CosNotificationC.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp index c7d8405a6b4..5110d567625 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Notify_Default_CO_Factory.h" +#include "orbsvcs/Notify/Notify_Default_CO_Factory.h" ACE_RCSID(Notify, Notify_Default_CO_Factory, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h index e2fa7daa528..8976e345f10 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h @@ -15,7 +15,7 @@ #define NOTIFY_DEFAULT_CO_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp index 3ba19a305a3..37a286dbb99 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Notify_Default_Collection_Factory.h" +#include "orbsvcs/Notify/Notify_Default_Collection_Factory.h" ACE_RCSID(Notify, Notify_Default_Collection_Factory, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h index fb8f4b19e17..c416d093de5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h @@ -15,7 +15,7 @@ #define NOTIFY_DEFAULT_COLLECTION_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp index 43421dd8e1a..2c9cc3f9237 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Notify_Default_EMO_Factory.h" +#include "orbsvcs/Notify/Notify_Default_EMO_Factory.h" ACE_RCSID(Notify, Notify_Default_EMO_Factory, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h index d4006d047c1..73023b439bf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h @@ -15,7 +15,7 @@ #define NOTIFY_DEFAULT_EMO_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp index 36870752bd4..6d32c554047 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Notify_Default_POA_Factory.h" +#include "orbsvcs/Notify/Notify_Default_POA_Factory.h" ACE_RCSID(Notify, Notify_Default_POA_Factory, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h index c8d06c164d7..62674479d29 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h @@ -15,7 +15,7 @@ #define TAO_NOTIFY_DEFAULT_POA_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp index 90bb5994142..2bc881f15a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "Notify_EventChannelFactory_i.h" +#include "orbsvcs/Notify/Notify_EventChannelFactory_i.h" -#include "Service.h" +#include "orbsvcs/Notify/Service.h" #include "ace/Dynamic_Service.h" #include "tao/PortableServer/Root_POA.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h index be9f5309976..60ccb0b068d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/CosNotifyChannelAdminS.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp index 7700bf28866..a73b9be6a6c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Notify_Extensions.h" +#include "orbsvcs/Notify/Notify_Extensions.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h index 655112314ea..247e7655d40 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h @@ -6,7 +6,7 @@ #include /**/ "ace/pre.h" -#include "notify_export.h" +#include "orbsvcs/Notify/notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp index 999f1496c63..a00a6c374b8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "Object.h" -#include "POA_Helper.h" -#include "Worker_Task.h" -#include "Properties.h" -#include "Builder.h" -#include "ThreadPool_Task.h" -#include "Reactive_Task.h" +#include "orbsvcs/Notify/Object.h" +#include "orbsvcs/Notify/POA_Helper.h" +#include "orbsvcs/Notify/Worker_Task.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/Builder.h" +#include "orbsvcs/Notify/ThreadPool_Task.h" +#include "orbsvcs/Notify/Reactive_Task.h" #include "tao/debug.h" -#include "Event_Manager.h" +#include "orbsvcs/Notify/Event_Manager.h" #if ! defined (__ACE_INLINE__) -#include "Object.inl" +#include "orbsvcs/Notify/Object.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_Object, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h index 29a673c8aad..7b9cb510b6c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h @@ -15,18 +15,18 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "QoSProperties.h" -#include "AdminProperties.h" -#include "Worker_Task.h" -#include "Refcountable.h" -#include "Name_Value_Pair.h" -#include "Event_Manager.h" +#include "orbsvcs/Notify/QoSProperties.h" +#include "orbsvcs/Notify/AdminProperties.h" +#include "orbsvcs/Notify/Worker_Task.h" +#include "orbsvcs/Notify/Refcountable.h" +#include "orbsvcs/Notify/Name_Value_Pair.h" +#include "orbsvcs/Notify/Event_Manager.h" #include "orbsvcs/NotifyExtC.h" @@ -213,7 +213,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Object.inl" +#include "orbsvcs/Notify/Object.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp index 048b6d5a04f..0137934dd22 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "POA_Helper.h" +#include "orbsvcs/Notify/POA_Helper.h" #if ! defined (__ACE_INLINE__) -#include "POA_Helper.inl" +#include "orbsvcs/Notify/POA_Helper.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(RT_Notify, TAO_Notify_POA_Helper, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h index af856d988cc..57b4208324e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h @@ -13,13 +13,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ID_Factory.h" +#include "orbsvcs/Notify/ID_Factory.h" #include "tao/PortableServer/PortableServer.h" @@ -107,7 +107,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "POA_Helper.inl" +#include "orbsvcs/Notify/POA_Helper.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp index 447c72c3ac5..6caa4aa6552 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "Peer.h" +#include "orbsvcs/Notify/Peer.h" ACE_RCSID(Notify, TAO_Notify_Peer, "$Id$") -#include "Proxy.h" +#include "orbsvcs/Notify/Proxy.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h index 8f9696b514e..142ef4484cf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h @@ -12,14 +12,14 @@ #define TAO_Notify_PEER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/CosNotificationC.h" -#include "EventTypeSeq.h" +#include "orbsvcs/Notify/EventTypeSeq.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp index fbe550de915..18cda388126 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Persistent_File_Allocator.h" +#include "orbsvcs/Notify/Persistent_File_Allocator.h" #include "tao/debug.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h index 7d0c335aeb4..718be6e8f54 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h @@ -23,9 +23,9 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "notify_serv_export.h" -#include "Random_File.h" -#include "Bit_Vector.h" +#include "orbsvcs/Notify/notify_serv_export.h" +#include "orbsvcs/Notify/Random_File.h" +#include "orbsvcs/Notify/Bit_Vector.h" #include "ace/Containers_T.h" #include "ace/Unbounded_Queue.h" #include "ace/Thread_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp index 43715586fbb..798f24fb7f1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Properties.h" +#include "orbsvcs/Notify/Properties.h" #include "orbsvcs/NotifyExtC.h" #include "tao/debug.h" #if ! defined (__ACE_INLINE__) -#include "Properties.inl" +#include "orbsvcs/Notify/Properties.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Notify, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h index 96119e8bb3e..7ab3ec74637 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -147,7 +147,7 @@ typedef TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX> TAO_Notify_PROPERT TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Properties.inl" +#include "orbsvcs/Notify/Properties.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property.h b/TAO/orbsvcs/orbsvcs/Notify/Property.h index 4a6660e5fcb..2d0ef880733 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp index 3e2a0472b3c..bd8adc484f6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "PropertySeq.h" +#include "orbsvcs/Notify/PropertySeq.h" #if ! defined (__ACE_INLINE__) -#include "PropertySeq.inl" +#include "orbsvcs/Notify/PropertySeq.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_PropertySeq, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h index 67b1e9f3124..315aac46a0b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -69,7 +69,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "PropertySeq.inl" +#include "orbsvcs/Notify/PropertySeq.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp index 01292422e60..378ca42dc41 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "Property_Boolean.h" +#include "orbsvcs/Notify/Property_Boolean.h" #if ! defined (__ACE_INLINE__) -#include "Property_Boolean.inl" +#include "orbsvcs/Notify/Property_Boolean.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_Property_Boolean, "$Id$") -#include "PropertySeq.h" +#include "orbsvcs/Notify/PropertySeq.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h index b70b06e415b..53c0f441de9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -81,7 +81,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Property_Boolean.inl" +#include "orbsvcs/Notify/Property_Boolean.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp index e4645971b8b..75b5675e2d5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp @@ -3,17 +3,17 @@ #ifndef TAO_Notify_PROPERTY_T_CPP #define TAO_Notify_PROPERTY_T_CPP -#include "Property_T.h" +#include "orbsvcs/Notify/Property_T.h" #if ! defined (__ACE_INLINE__) -#include "Property_T.inl" +#include "orbsvcs/Notify/Property_T.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Notify, TAO_Notify_Property_T, "$Id$") -#include "PropertySeq.h" +#include "orbsvcs/Notify/PropertySeq.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h index e30f0df0d6b..39a79608659 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -155,11 +155,11 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Property_T.inl" +#include "orbsvcs/Notify/Property_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Property_T.cpp" +#include "orbsvcs/Notify/Property_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp index 7531506de15..a088943d05b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp @@ -1,20 +1,20 @@ // $Id$ -#include "Proxy.h" +#include "orbsvcs/Notify/Proxy.h" #if ! defined (__ACE_INLINE__) -#include "Proxy.inl" +#include "orbsvcs/Notify/Proxy.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_Proxy, "$Id$") -#include "Peer.h" -#include "Proxy.h" -#include "Method_Request_Updates.h" -#include "Worker_Task.h" -#include "Properties.h" -#include "POA_Helper.h" -#include "Topology_Saver.h" +#include "orbsvcs/Notify/Peer.h" +#include "orbsvcs/Notify/Proxy.h" +#include "orbsvcs/Notify/Method_Request_Updates.h" +#include "orbsvcs/Notify/Worker_Task.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/POA_Helper.h" +#include "orbsvcs/Notify/Topology_Saver.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h index 7804ed43040..d6931ece562 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h @@ -13,16 +13,16 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Topology_Object.h" -#include "EventTypeSeq.h" -#include "FilterAdmin.h" -#include "Admin.h" +#include "orbsvcs/Notify/Topology_Object.h" +#include "orbsvcs/Notify/EventTypeSeq.h" +#include "orbsvcs/Notify/FilterAdmin.h" +#include "orbsvcs/Notify/Admin.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -131,7 +131,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Proxy.inl" +#include "orbsvcs/Notify/Proxy.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp index bc520625a1a..cd7587bfacd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp @@ -1,26 +1,26 @@ // $Id$ -#include "ProxyConsumer.h" +#include "orbsvcs/Notify/ProxyConsumer.h" #if ! defined (__ACE_INLINE__) -#include "ProxyConsumer.inl" +#include "orbsvcs/Notify/ProxyConsumer.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_ProxyConsumer, "$Id$") #include "tao/debug.h" #include "ace/Atomic_Op.h" -#include "Supplier.h" -#include "AdminProperties.h" -#include "Property.h" -#include "Proxy.h" -#include "Event_Manager.h" -#include "Method_Request_Lookup.h" -#include "Worker_Task.h" -#include "Properties.h" -#include "SupplierAdmin.h" -#include "EventChannel.h" -#include "Routing_Slip.h" +#include "orbsvcs/Notify/Supplier.h" +#include "orbsvcs/Notify/AdminProperties.h" +#include "orbsvcs/Notify/Property.h" +#include "orbsvcs/Notify/Proxy.h" +#include "orbsvcs/Notify/Event_Manager.h" +#include "orbsvcs/Notify/Method_Request_Lookup.h" +#include "orbsvcs/Notify/Worker_Task.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/SupplierAdmin.h" +#include "orbsvcs/Notify/EventChannel.h" +#include "orbsvcs/Notify/Routing_Slip.h" //#define DEBUG_LEVEL 10 #ifndef DEBUG_LEVEL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h index 2da1623c562..17890c772f2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h @@ -13,10 +13,10 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" -#include "Event.h" -#include "Proxy.h" -#include "SupplierAdmin.h" +#include "orbsvcs/Notify/notify_serv_export.h" +#include "orbsvcs/Notify/Event.h" +#include "orbsvcs/Notify/Proxy.h" +#include "orbsvcs/Notify/SupplierAdmin.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -98,7 +98,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ProxyConsumer.inl" +#include "orbsvcs/Notify/ProxyConsumer.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp index 07717d00a8b..a47122b58d5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp @@ -3,10 +3,10 @@ #ifndef TAO_Notify_PROXYCONSUMER_T_CPP #define TAO_Notify_PROXYCONSUMER_T_CPP -#include "ProxyConsumer_T.h" -#include "SupplierAdmin.h" +#include "orbsvcs/Notify/ProxyConsumer_T.h" +#include "orbsvcs/Notify/SupplierAdmin.h" -#include "Event_Manager.h" +#include "orbsvcs/Notify/Event_Manager.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h index 7505ad91258..bcb0ada782b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h @@ -13,14 +13,14 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Proxy_T.h" -#include "ProxyConsumer.h" +#include "orbsvcs/Notify/Proxy_T.h" +#include "orbsvcs/Notify/ProxyConsumer.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -75,7 +75,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ProxyConsumer_T.cpp" +#include "orbsvcs/Notify/ProxyConsumer_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp index 172a52657ab..4d7a0c3023d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp @@ -1,21 +1,21 @@ // $Id$ -#include "ProxySupplier.h" +#include "orbsvcs/Notify/ProxySupplier.h" #if ! defined (__ACE_INLINE__) -#include "ProxySupplier.inl" +#include "orbsvcs/Notify/ProxySupplier.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_ProxySupplier, "$Id$") -#include "Event_Manager.h" -#include "AdminProperties.h" -#include "Consumer.h" -#include "Method_Request_Dispatch.h" -#include "Worker_Task.h" -#include "Buffering_Strategy.h" -#include "Properties.h" -#include "ConsumerAdmin.h" +#include "orbsvcs/Notify/Event_Manager.h" +#include "orbsvcs/Notify/AdminProperties.h" +#include "orbsvcs/Notify/Consumer.h" +#include "orbsvcs/Notify/Method_Request_Dispatch.h" +#include "orbsvcs/Notify/Worker_Task.h" +#include "orbsvcs/Notify/Buffering_Strategy.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/ConsumerAdmin.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h index 90d74bd96ff..17ced483590 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h @@ -12,15 +12,15 @@ #define TAO_Notify_PROXYSUPPLIER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Event.h" -#include "Proxy.h" -#include "ConsumerAdmin.h" +#include "orbsvcs/Notify/Event.h" +#include "orbsvcs/Notify/Proxy.h" +#include "orbsvcs/Notify/ConsumerAdmin.h" #include "orbsvcs/CosEventChannelAdminC.h" @@ -94,7 +94,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ProxySupplier.inl" +#include "orbsvcs/Notify/ProxySupplier.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp index 84e8b3e021b..b979887cb6a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp @@ -3,16 +3,16 @@ #ifndef TAO_Notify_PROXYSUPPLIER_T_CPP #define TAO_Notify_PROXYSUPPLIER_T_CPP -#include "ProxySupplier_T.h" +#include "orbsvcs/Notify/ProxySupplier_T.h" -#include "Consumer.h" +#include "orbsvcs/Notify/Consumer.h" #include "Structured/StructuredEvent.h" #include "Any/AnyEvent.h" -#include "Method_Request_Dispatch.h" -#include "Worker_Task.h" -#include "Event_Manager.h" -#include "ConsumerAdmin.h" +#include "orbsvcs/Notify/Method_Request_Dispatch.h" +#include "orbsvcs/Notify/Worker_Task.h" +#include "orbsvcs/Notify/Event_Manager.h" +#include "orbsvcs/Notify/ConsumerAdmin.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h index ec59af8dc55..f31cba76ee9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h @@ -12,14 +12,14 @@ #define TAO_Notify_PROXYSUPPLIER_T_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Proxy_T.h" -#include "ProxySupplier.h" +#include "orbsvcs/Notify/Proxy_T.h" +#include "orbsvcs/Notify/ProxySupplier.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -150,7 +150,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ProxySupplier_T.cpp" +#include "orbsvcs/Notify/ProxySupplier_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp index cb186669514..518db5e5c02 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Proxy_T.h" +#include "orbsvcs/Notify/Proxy_T.h" #ifndef TAO_Notify_PROXY_T_CPP #define TAO_Notify_PROXY_T_CPP diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h index 25fdfac6e99..2cdc149f502 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Proxy.h" +#include "orbsvcs/Notify/Proxy.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -150,7 +150,7 @@ TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushConsumer>; TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Proxy_T.cpp" +#include "orbsvcs/Notify/Proxy_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp index f6c0d13f7d1..73d20823325 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "QoSProperties.h" +#include "orbsvcs/Notify/QoSProperties.h" #if ! defined (__ACE_INLINE__) -#include "QoSProperties.inl" +#include "orbsvcs/Notify/QoSProperties.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_QoSProperties, "$Id$") -#include "Property.h" -#include "Notify_Extensions.h" +#include "orbsvcs/Notify/Property.h" +#include "orbsvcs/Notify/Notify_Extensions.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h index 086f8934b25..6ce71f0941c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h @@ -13,16 +13,16 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PropertySeq.h" -#include "Property_T.h" -#include "Property_Boolean.h" -#include "Property.h" +#include "orbsvcs/Notify/PropertySeq.h" +#include "orbsvcs/Notify/Property_T.h" +#include "orbsvcs/Notify/Property_Boolean.h" +#include "orbsvcs/Notify/Property.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -112,7 +112,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "QoSProperties.inl" +#include "orbsvcs/Notify/QoSProperties.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp index 18b2b74e182..98b297f069a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "RT_Builder.h" +#include "orbsvcs/Notify/RT_Builder.h" #include "ace/Auto_Ptr.h" #include "ace/Dynamic_Service.h" -#include "ETCL_FilterFactory.h" -#include "RT_POA_Helper.h" -#include "Properties.h" +#include "orbsvcs/Notify/ETCL_FilterFactory.h" +#include "orbsvcs/Notify/RT_POA_Helper.h" +#include "orbsvcs/Notify/Properties.h" #include "orbsvcs/NotifyExtC.h" -#include "Object.h" +#include "orbsvcs/Notify/Object.h" ACE_RCSID (RT_Notify, TAO_Notify_RT_Builder, diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h index 897fffe1ad4..6e0b2bba087 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h @@ -12,13 +12,13 @@ #define TAO_Notify_RT_BUILDER_H #include /**/ "ace/pre.h" -#include "rt_notify_export.h" +#include "orbsvcs/Notify/rt_notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Builder.h" +#include "orbsvcs/Notify/Builder.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp index bb817a8617e..9c33cfb735d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "RT_Factory.h" +#include "orbsvcs/Notify/RT_Factory.h" #include "Structured/RT_StructuredProxyPushSupplier.h" ACE_RCSID(RT_Notify, TAO_Notify_RT_Factory, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h index 7ab6d865d24..38bf46c4662 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h @@ -12,13 +12,13 @@ #define TAO_Notify_RT_FACTORY_H #include /**/ "ace/pre.h" -#include "rt_notify_export.h" +#include "orbsvcs/Notify/rt_notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Default_Factory.h" +#include "orbsvcs/Notify/Default_Factory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp index a7dea4d13d9..f9e4ce24128 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "RT_Notify_Service.h" +#include "orbsvcs/Notify/RT_Notify_Service.h" ACE_RCSID(RT_Notify, TAO_Notify_RT_Notify_Service, "$Id$") #include "ace/Dynamic_Service.h" -#include "Properties.h" -#include "RT_Properties.h" -#include "RT_Factory.h" -#include "RT_Builder.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/RT_Properties.h" +#include "orbsvcs/Notify/RT_Factory.h" +#include "orbsvcs/Notify/RT_Builder.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h index 43270e88752..6383e95fc34 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h @@ -14,13 +14,13 @@ #define TAO_Notify_RT_NOTIFY_SERVICE_H #include /**/ "ace/pre.h" -#include "rt_notify_export.h" +#include "orbsvcs/Notify/rt_notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CosNotify_Service.h" +#include "orbsvcs/Notify/CosNotify_Service.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp index 9d95c26c4f9..81859ded60f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "RT_POA_Helper.h" +#include "orbsvcs/Notify/RT_POA_Helper.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/debug.h" #include "orbsvcs/NotifyExtC.h" -#include "RT_Properties.h" +#include "orbsvcs/Notify/RT_Properties.h" #include "ace/SString.h" ACE_RCSID (Notify, diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h index fd17fce6758..d272420ef98 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h @@ -12,13 +12,13 @@ #define TAO_Notify_RT_POA_Helper_H #include /**/ "ace/pre.h" -#include "rt_notify_export.h" +#include "orbsvcs/Notify/rt_notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "POA_Helper.h" +#include "orbsvcs/Notify/POA_Helper.h" #include "orbsvcs/NotifyExtC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp index 6fc6494275c..6a5aff084e8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "RT_Properties.h" +#include "orbsvcs/Notify/RT_Properties.h" #if ! defined (__ACE_INLINE__) -#include "RT_Properties.inl" +#include "orbsvcs/Notify/RT_Properties.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(RT_Notify, TAO_Notify_RT_Properties, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h index 9ca1e3bd267..124f8757145 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h @@ -12,7 +12,7 @@ #define TAO_Notify_RT_PROPERTIES_H #include /**/ "ace/pre.h" -#include "rt_notify_export.h" +#include "orbsvcs/Notify/rt_notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -61,7 +61,7 @@ typedef TAO_Singleton<TAO_Notify_RT_Properties, TAO_SYNCH_MUTEX> TAO_Notify_RT_P TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "RT_Properties.inl" +#include "orbsvcs/Notify/RT_Properties.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp index c112f8b337d..b0e528de02b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Random_File.h" +#include "orbsvcs/Notify/Random_File.h" #include "ace/OS.h" #include "ace/Log_Msg.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h index bf8fb72a1cc..c3ebfcd96bf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h @@ -22,7 +22,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #include "tao/Versioned_Namespace.h" #include "ace/FILE.h" #include "ace/streams.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp index 747635dac2c..be6bdd90518 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "Reactive_Task.h" +#include "orbsvcs/Notify/Reactive_Task.h" #if ! defined (__ACE_INLINE__) -#include "Reactive_Task.inl" +#include "orbsvcs/Notify/Reactive_Task.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_Reactive_Task, "$Id$") -#include "Timer_Reactor.h" +#include "orbsvcs/Notify/Timer_Reactor.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h index 76666401d86..b7a602cd67c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h @@ -13,15 +13,15 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Worker_Task.h" -#include "AdminProperties.h" -#include "Timer_Reactor.h" +#include "orbsvcs/Notify/Worker_Task.h" +#include "orbsvcs/Notify/AdminProperties.h" +#include "orbsvcs/Notify/Timer_Reactor.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -69,7 +69,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Reactive_Task.inl" +#include "orbsvcs/Notify/Reactive_Task.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp index 0ac69eb3698..4c5857f45c8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp @@ -11,7 +11,7 @@ #ifndef RECONNECT_WORKER_CPP #define RECONNECT_WORKER_CPP -#include "Reconnect_Worker_T.h" +#include "orbsvcs/Notify/Reconnect_Worker_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h index add7fd2ef1e..a4c71244ec2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h @@ -42,7 +42,7 @@ namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Reconnect_Worker_T.cpp" +#include "orbsvcs/Notify/Reconnect_Worker_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp index 4ee5c51ac00..8eba0d841ef 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp @@ -7,11 +7,11 @@ * * @author Dale Wilson <wilson_d@ociweb.com> */ -#include "Reconnection_Registry.h" +#include "orbsvcs/Notify/Reconnection_Registry.h" #include "tao/debug.h" -#include "Properties.h" -#include "Topology_Saver.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/Topology_Saver.h" #include "ace/Vector_T.h" //#define DEBUG_LEVEL 10 #ifndef DEBUG_LEVEL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h index 846e0dea054..0c84190d5a9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h @@ -17,7 +17,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Topology_Object.h" +#include "orbsvcs/Notify/Topology_Object.h" #include "orbsvcs/NotifyExtS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp index 874d67d7da8..0d06a3c0e05 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Refcountable.h" +#include "orbsvcs/Notify/Refcountable.h" #include "tao/debug.h" #include "ace/Log_Msg.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h index 2e5ef763fa5..960c7e37a93 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h @@ -13,8 +13,8 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" -#include "Refcountable_Guard_T.h" +#include "orbsvcs/Notify/notify_serv_export.h" +#include "orbsvcs/Notify/Refcountable_Guard_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp index f1bc562fe65..9f037fef711 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp @@ -3,10 +3,10 @@ #ifndef TAO_Notify_REFCOUNTABLE_GUARD_T_CPP #define TAO_Notify_REFCOUNTABLE_GUARD_T_CPP -#include "Refcountable_Guard_T.h" +#include "orbsvcs/Notify/Refcountable_Guard_T.h" #if ! defined (__ACE_INLINE__) -#include "Refcountable_Guard_T.inl" +#include "orbsvcs/Notify/Refcountable_Guard_T.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Notify, TAO_Notify_Refcountable_Guard_T, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h index 64c90962b50..3d6535fca34 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -73,11 +73,11 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Refcountable_Guard_T.inl" +#include "orbsvcs/Notify/Refcountable_Guard_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Refcountable_Guard_T.cpp" +#include "orbsvcs/Notify/Refcountable_Guard_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp index 8f389e1265f..eb101ef2105 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp @@ -1,16 +1,16 @@ // $Id$ -#include "Routing_Slip.h" - -#include "Delivery_Request.h" -#include "Worker_Task.h" -#include "ProxyConsumer.h" -#include "ProxySupplier.h" -#include "Event_Persistence_Strategy.h" -#include "Routing_Slip_Persistence_Manager.h" -#include "Routing_Slip_Queue.h" -#include "Method_Request_Lookup.h" -#include "Method_Request_Dispatch.h" +#include "orbsvcs/Notify/Routing_Slip.h" + +#include "orbsvcs/Notify/Delivery_Request.h" +#include "orbsvcs/Notify/Worker_Task.h" +#include "orbsvcs/Notify/ProxyConsumer.h" +#include "orbsvcs/Notify/ProxySupplier.h" +#include "orbsvcs/Notify/Event_Persistence_Strategy.h" +#include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h" +#include "orbsvcs/Notify/Routing_Slip_Queue.h" +#include "orbsvcs/Notify/Method_Request_Lookup.h" +#include "orbsvcs/Notify/Method_Request_Dispatch.h" #include "tao/debug.h" #include "tao/corba.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h index 574632031d3..5670dfc1d05 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h @@ -12,12 +12,12 @@ #define TAO_NOTIFY_ROUTING_SLIP_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" -#include "Event.h" -#include "Delivery_Request.h" -#include "Event_Persistence_Factory.h" +#include "orbsvcs/Notify/notify_serv_export.h" +#include "orbsvcs/Notify/Event.h" +#include "orbsvcs/Notify/Delivery_Request.h" +#include "orbsvcs/Notify/Event_Persistence_Factory.h" -#include "Persistent_File_Allocator.h" // for Persistent_Callback +#include "orbsvcs/Notify/Persistent_File_Allocator.h" // for Persistent_Callback #include <ace/Vector_T.h> #include <ace/Malloc_Base.h> // necessary? diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp index b4e0560b9e2..5af000fc040 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "Routing_Slip_Persistence_Manager.h" -#include "Standard_Event_Persistence.h" -#include "Persistent_File_Allocator.h" +#include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h" +#include "orbsvcs/Notify/Standard_Event_Persistence.h" +#include "orbsvcs/Notify/Persistent_File_Allocator.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h index cdcf735ee14..0704a315884 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h @@ -18,7 +18,7 @@ #define ROUTING_SLIP_PERSISTENCE_MANAGER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp index 57c6d05b88f..4447981d06f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Routing_Slip_Queue.h" +#include "orbsvcs/Notify/Routing_Slip_Queue.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h index 3609f2e78ed..4d28e093c0b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h @@ -6,7 +6,7 @@ #define TAO_NOTIFY_ROUTING_SLIP_QUEUE_H #include /**/ "ace/pre.h" -#include "Routing_Slip.h" +#include "orbsvcs/Notify/Routing_Slip.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h index ce4aacc2e6d..a9d425891f0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h @@ -51,7 +51,7 @@ namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Save_Persist_Worker_T.cpp" +#include "orbsvcs/Notify/Save_Persist_Worker_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp index 670f81e0723..a1a29b3eb35 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp @@ -3,10 +3,10 @@ #ifndef TAO_Notify_SEQ_WORKER_T_CPP #define TAO_Notify_SEQ_WORKER_T_CPP -#include "Seq_Worker_T.h" +#include "orbsvcs/Notify/Seq_Worker_T.h" #if ! defined (__ACE_INLINE__) -#include "Seq_Worker_T.inl" +#include "orbsvcs/Notify/Seq_Worker_T.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h index 7970e4dd796..5e89210356e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h @@ -12,7 +12,7 @@ #define TAO_Notify_SEQ_WORKER_T_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -20,7 +20,7 @@ #include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "orbsvcs/ESF/ESF_Worker.h" -#include "Container_T.h" +#include "orbsvcs/Notify/Container_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -57,11 +57,11 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Seq_Worker_T.inl" +#include "orbsvcs/Notify/Seq_Worker_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Seq_Worker_T.cpp" +#include "orbsvcs/Notify/Seq_Worker_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp index 745ecdec164..3b788277230 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "SequenceProxyPushConsumer.h" +#include "orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h" ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushConsumer, "$Id$") #include "tao/debug.h" -#include "SequencePushSupplier.h" +#include "orbsvcs/Notify/Sequence/SequencePushSupplier.h" #include "../AdminProperties.h" #include "../Structured/StructuredEvent.h" #include "../Properties.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp index f1effd6afb6..5a3c87f8f75 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "SequenceProxyPushSupplier.h" +#include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h" ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushSupplier, "$Id$") #include "tao/debug.h" -#include "SequencePushConsumer.h" +#include "orbsvcs/Notify/Sequence/SequencePushConsumer.h" #include "../Properties.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp index 5c7947f120a..fd7f491cba6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "SequencePushConsumer.h" +#include "orbsvcs/Notify/Sequence/SequencePushConsumer.h" ACE_RCSID (Notify, TAO_Notify_SequencePushConsumer, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp index ac918a5eac0..5f296849962 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "SequencePushSupplier.h" +#include "orbsvcs/Notify/Sequence/SequencePushSupplier.h" ACE_RCSID (Notify, TAO_Notify_SequencePushSupplier, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp index 814327a8e2b..f4cda660134 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Service.h" +#include "orbsvcs/Notify/Service.h" ACE_RCSID (Notify, TAO_Notify_Service, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h index 17cb759da7d..6fdfd47f2ab 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h @@ -12,7 +12,7 @@ #define TAO_Notify_SERVICE_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp index 5fd3fe056db..65389ef7c35 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Standard_Event_Persistence.h" -#include "Persistent_File_Allocator.h" +#include "orbsvcs/Notify/Standard_Event_Persistence.h" +#include "orbsvcs/Notify/Persistent_File_Allocator.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h index c88c0be393e..995577d761a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h @@ -21,10 +21,10 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Event_Persistence_Strategy.h" -#include "Event_Persistence_Factory.h" -#include "Persistent_File_Allocator.h" -#include "Routing_Slip_Persistence_Manager.h" +#include "orbsvcs/Notify/Event_Persistence_Strategy.h" +#include "orbsvcs/Notify/Event_Persistence_Factory.h" +#include "orbsvcs/Notify/Persistent_File_Allocator.h" +#include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h" #include <ace/SString.h> diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp index eb59410e675..c65d4a7c86b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "RT_StructuredProxyPushSupplier.h" +#include "orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h" #include "tao/debug.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h index 15559b2f7cf..a72c192a2d9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "StructuredProxyPushSupplier.h" +#include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp index 9e993168809..9be54acc032 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "StructuredEvent.h" +#include "orbsvcs/Notify/Structured/StructuredEvent.h" ACE_RCSID(RT_Notify, TAO_Notify_StructuredEvent, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index b1e1c226bac..f235104d446 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "StructuredProxyPushConsumer.h" +#include "orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h" ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushConsumer, "$Id$") #include "ace/Bound_Ptr.h" #include "ace/Auto_Ptr.h" #include "tao/debug.h" -#include "StructuredPushSupplier.h" -#include "StructuredEvent.h" +#include "orbsvcs/Notify/Structured/StructuredPushSupplier.h" +#include "orbsvcs/Notify/Structured/StructuredEvent.h" #include "../AdminProperties.h" #include "../Properties.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp index 49171f049df..950c5cbc7e3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "StructuredProxyPushSupplier.h" +#include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h" #include "tao/PortableServer/Servant_Base.h" #include "tao/debug.h" -#include "StructuredPushConsumer.h" +#include "orbsvcs/Notify/Structured/StructuredPushConsumer.h" #include "../Properties.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp index cc4573dd99a..83a30f68519 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp @@ -1,5 +1,5 @@ // $Id$ -#include "StructuredPushConsumer.h" +#include "orbsvcs/Notify/Structured/StructuredPushConsumer.h" ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushConsumer, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp index 0fa03545038..6fb8f3e6779 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "StructuredPushSupplier.h" +#include "orbsvcs/Notify/Structured/StructuredPushSupplier.h" ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushSupplier, "$Id$") #include "../Properties.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp index b4f7cf22a87..70e0e846b04 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "Subscription_Change_Worker.h" +#include "orbsvcs/Notify/Subscription_Change_Worker.h" -#include "Proxy.h" +#include "orbsvcs/Notify/Proxy.h" ACE_RCSID(Notify, TAO_Subscription_Change_Worker, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h index 5e388ae5f1f..dc17f2a64b6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h @@ -12,7 +12,7 @@ #define TAO_SUBSCRIPTION_CHANGE_WORKER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp index 00f17fa253a..bf1d0eae7ee 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "Supplier.h" +#include "orbsvcs/Notify/Supplier.h" #if ! defined (__ACE_INLINE__) -#include "Supplier.inl" +#include "orbsvcs/Notify/Supplier.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(Notify, TAO_Notify_Supplier, "$Id$") -#include "ProxyConsumer.h" -#include "Proxy.h" +#include "orbsvcs/Notify/ProxyConsumer.h" +#include "orbsvcs/Notify/Proxy.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h index c772cdef02b..f8032aae3d7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h @@ -12,13 +12,13 @@ #define TAO_Notify_SUPPLIER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Peer.h" +#include "orbsvcs/Notify/Peer.h" #include "orbsvcs/CosNotifyCommC.h" @@ -63,7 +63,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Supplier.inl" +#include "orbsvcs/Notify/Supplier.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp index dc0afa410ec..71ff8590b4c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -1,18 +1,18 @@ // $Id$ -#include "SupplierAdmin.h" +#include "orbsvcs/Notify/SupplierAdmin.h" ACE_RCSID (RT_Notify, TAO_Notify_SupplierAdmin, "$Id$") -#include "Builder.h" -#include "ProxyConsumer.h" -#include "EventChannel.h" -#include "Subscription_Change_Worker.h" -#include "Find_Worker_T.h" -#include "Seq_Worker_T.h" -#include "Properties.h" +#include "orbsvcs/Notify/Builder.h" +#include "orbsvcs/Notify/ProxyConsumer.h" +#include "orbsvcs/Notify/EventChannel.h" +#include "orbsvcs/Notify/Subscription_Change_Worker.h" +#include "orbsvcs/Notify/Find_Worker_T.h" +#include "orbsvcs/Notify/Seq_Worker_T.h" +#include "orbsvcs/Notify/Properties.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h index ac31f5af99d..eeeaf0d40ab 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h @@ -13,8 +13,8 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" -#include "Admin.h" +#include "orbsvcs/Notify/notify_serv_export.h" +#include "orbsvcs/Notify/Admin.h" #include "orbsvcs/NotifyExtS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h index 733f7982ed7..0a28afc1792 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h @@ -12,14 +12,14 @@ #define TAO_Notify_SUPPLIER_MAP_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Event_Map_T.h" -#include "ProxyConsumer.h" +#include "orbsvcs/Notify/Event_Map_T.h" +#include "orbsvcs/Notify/ProxyConsumer.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp index 875bbb0fca5..01a7a51711f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "ThreadPool_Task.h" +#include "orbsvcs/Notify/ThreadPool_Task.h" ACE_RCSID(Notify, TAO_Notify_ThreadPool_Task, "$Id$") -#include "Properties.h" -#include "Timer_Queue.h" -#include "Buffering_Strategy.h" +#include "orbsvcs/Notify/Properties.h" +#include "orbsvcs/Notify/Timer_Queue.h" +#include "orbsvcs/Notify/Buffering_Strategy.h" #include "tao/debug.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h index cbea2a75782..ffff9d3a1a6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h @@ -13,11 +13,11 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" -#include "Timer_Queue.h" -#include "AdminProperties.h" -#include "Worker_Task.h" +#include "orbsvcs/Notify/Timer_Queue.h" +#include "orbsvcs/Notify/AdminProperties.h" +#include "orbsvcs/Notify/Worker_Task.h" #include "ace/Task.h" #include "ace/Message_Queue.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer.h b/TAO/orbsvcs/orbsvcs/Notify/Timer.h index 1efed121cf8..3b3a829f7e7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer.h @@ -12,13 +12,13 @@ #define TAO_Notify_TIMER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Refcountable.h" +#include "orbsvcs/Notify/Refcountable.h" #include "ace/Time_Value.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp index c4ef3fbb87f..642f313f2f3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Timer_Queue.h" +#include "orbsvcs/Notify/Timer_Queue.h" ACE_RCSID (Notify, TAO_Notify_Timer_Queue, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h index fc143b6fd9e..3f0f021e217 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h @@ -12,9 +12,9 @@ #define TAO_Notify_TIMER_QUEUE_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" -#include "Timer.h" +#include "orbsvcs/Notify/Timer.h" #include "ace/Timer_Queue.h" #include "ace/Timer_Heap.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp index 0bc8d56bc1e..8109a230c30 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "Timer_Reactor.h" +#include "orbsvcs/Notify/Timer_Reactor.h" ACE_RCSID (Notify, Timer_Reactor, "$Id$") -#include "Properties.h" +#include "orbsvcs/Notify/Properties.h" #include "tao/ORB_Core.h" #include "ace/Reactor.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h index 2fe63ad4f4a..31ef686604c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h @@ -12,8 +12,8 @@ #define TAO_Notify_TIMER_REACTOR_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" -#include "Timer.h" +#include "orbsvcs/Notify/notify_serv_export.h" +#include "orbsvcs/Notify/Timer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h index ff1ffe8581d..33f313825a6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h @@ -12,7 +12,7 @@ #define TAO_NOTIFY_TOPOLOGY_FACTORY_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #include "ace/Service_Object.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp index c2274be240f..27eeb6ad143 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Topology_Loader.h" +#include "orbsvcs/Notify/Topology_Loader.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h index 252dd5cf064..599afa07985 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h @@ -14,7 +14,7 @@ #define TOPOLOGY_LOADER_H #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #include "ace/config-all.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp index f6067d94863..ac174723aa3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Topology_Object.h" +#include "orbsvcs/Notify/Topology_Object.h" #if ! defined (__ACE_INLINE__) -#include "Topology_Object.inl" +#include "orbsvcs/Notify/Topology_Object.inl" #endif /* __ACE_INLINE__ */ // question: is there a race_conditon with self_changed and children_changed? diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h index f94b6bb7f3c..53e825c0939 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h @@ -14,8 +14,8 @@ #define TOPOLOGY_OBJECT_H #include /**/ "ace/pre.h" -#include "Object.h" -#include "Name_Value_Pair.h" +#include "orbsvcs/Notify/Object.h" +#include "orbsvcs/Notify/Name_Value_Pair.h" #include "ace/SString.h" #include "ace/Vector_T.h" @@ -205,7 +205,7 @@ namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Topology_Object.inl" +#include "orbsvcs/Notify/Topology_Object.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp index f8f2e52f16c..65c9aa9f681 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Topology_Saver.h" +#include "orbsvcs/Notify/Topology_Saver.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h index dd34b5fa1d1..91648109b7a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h @@ -14,8 +14,8 @@ #define TOPOLOGY_SAVER_H #include /**/ "ace/pre.h" -#include "Topology_Object.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/Topology_Object.h" +#include "orbsvcs/Notify/notify_serv_export.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp index 579e0b99257..6fb6d3c2e6b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Worker_Task.h" +#include "orbsvcs/Notify/Worker_Task.h" ACE_RCSID(Notify, TAO_Notify_Worker_Task, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h index df0271e2ab9..b1e529c56bd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h @@ -13,14 +13,14 @@ #include /**/ "ace/pre.h" -#include "notify_serv_export.h" +#include "orbsvcs/Notify/notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Method_Request.h" -#include "Refcountable.h" +#include "orbsvcs/Notify/Method_Request.h" +#include "orbsvcs/Notify/Refcountable.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp index 83b047bf272..fbd1138e13c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "XML_Loader.h" -#include "Topology_Object.h" +#include "orbsvcs/Notify/XML_Loader.h" +#include "orbsvcs/Notify/Topology_Object.h" #include "ACEXML/common/DefaultHandler.h" #include "ACEXML/parser/parser/Parser.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h index 25f7706b4b7..7069179d9bd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h @@ -21,7 +21,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Topology_Loader.h" +#include "orbsvcs/Notify/Topology_Loader.h" #include "ACEXML/common/DefaultHandler.h" #include "ACEXML/parser/parser/Parser.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp index 1dfe0d5720e..f6f0864b46f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "XML_Saver.h" +#include "orbsvcs/Notify/XML_Saver.h" #include "ACEXML/common/XML_Util.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h index 9659db2d730..f7c9afb87e1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h @@ -14,7 +14,7 @@ #define XML_SAVER_H #include /**/ "ace/pre.h" -#include "Topology_Saver.h" +#include "orbsvcs/Notify/Topology_Saver.h" #include "ace/streams.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp index 2ef83d858cf..8b263987fe8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "XML_Topology_Factory.h" -#include "XML_Saver.h" -#include "XML_Loader.h" +#include "orbsvcs/Notify/XML_Topology_Factory.h" +#include "orbsvcs/Notify/XML_Saver.h" +#include "orbsvcs/Notify/XML_Loader.h" #include "tao/debug.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h index 6c8ca9198ec..b6dc0686d8a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h @@ -14,8 +14,8 @@ #define XML_TOPOLOGY_FACTORY_H #include /**/ "ace/pre.h" -#include "Topology_Factory.h" -#include "notify_persist_export.h" +#include "orbsvcs/Notify/Topology_Factory.h" +#include "orbsvcs/Notify/notify_persist_export.h" #include "tao/corba.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp index 8da2b64f743..8632d05edcf 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp @@ -1,4 +1,4 @@ -#include "GOA.h" +#include "orbsvcs/PortableGroup/GOA.h" ACE_RCSID (PortableGroup, @@ -6,8 +6,8 @@ ACE_RCSID (PortableGroup, "$Id$") -#include "PortableGroup_Acceptor_Registry.h" -#include "PortableGroup_Request_Dispatcher.h" +#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h" +#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h index dd869cc7c33..12af8d574a5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp index ca6f4bdd882..ac2bbec66cf 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp @@ -1,8 +1,8 @@ -#include "MIOP.h" -#include "UIPMC_Factory.h" +#include "orbsvcs/PortableGroup/MIOP.h" +#include "orbsvcs/PortableGroup/UIPMC_Factory.h" #include "ace/Service_Config.h" -#include "PortableGroup_Loader.h" -#include "PG_Object_Adapter_Factory.h" +#include "orbsvcs/PortableGroup/PortableGroup_Loader.h" +#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h" ACE_RCSID (PortableGroup, UIPMC_Factory, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h index 3ca193916d0..7e6219a5e67 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h @@ -13,7 +13,7 @@ #define TAO_MIOP_H #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp index 361651d0487..fe3650caa71 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp @@ -1,5 +1,5 @@ -#include "PG_Default_Property_Validator.h" -#include "PG_Operators.h" +#include "orbsvcs/PortableGroup/PG_Default_Property_Validator.h" +#include "orbsvcs/PortableGroup/PG_Operators.h" ACE_RCSID (PortableGroup, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h index 96457ed6b2d..9f9ced075d9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index 1ec6fc67ae0..330d3984006 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- // $Id$ -#include "PG_FactoryRegistry.h" +#include "orbsvcs/PortableGroup/PG_FactoryRegistry.h" #include "ace/Get_Opt.h" #include "ace/Vector_T.h" @@ -11,7 +11,7 @@ #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/PortableServer/POAManagerC.h" -#include "PG_Operators.h" // operator == on CosNaming::Name +#include "orbsvcs/PortableGroup/PG_Operators.h" // operator == on CosNaming::Name TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index cf9962182fd..b16268b5f66 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -26,7 +26,7 @@ ///////////////////////////////// // Includes needed by this header -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "orbsvcs/PortableGroupS.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h index cbd367cb4ff..33c4e1cf421 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PG_Factory_Set.h" +#include "orbsvcs/PortableGroup/PG_Factory_Set.h" #include "orbsvcs/PortableGroupC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index f0f3de9d9bc..0461276bea1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -1,9 +1,9 @@ -#include "PG_GenericFactory.h" -#include "PG_MemberInfo.h" -#include "PG_ObjectGroupManager.h" -#include "PG_PropertyManager.h" -#include "PG_Property_Utils.h" -#include "PG_conf.h" +#include "orbsvcs/PortableGroup/PG_GenericFactory.h" +#include "orbsvcs/PortableGroup/PG_MemberInfo.h" +#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" +#include "orbsvcs/PortableGroup/PG_PropertyManager.h" +#include "orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "orbsvcs/PortableGroup/PG_conf.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h index 72115e812e0..96b725c941a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h @@ -22,8 +22,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PG_Factory_Map.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/PG_Factory_Map.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "tao/PortableServer/PortableServerC.h" #include "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 022f1649c75..3c84812d454 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -10,11 +10,11 @@ */ //============================================================================= -#include "PG_Group_Factory.h" -#include "PG_Property_Utils.h" -#include "PG_conf.h" +#include "orbsvcs/PortableGroup/PG_Group_Factory.h" +#include "orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "orbsvcs/PortableGroup/PG_conf.h" #include "orbsvcs/PortableGroupC.h" -#include "PG_Object_Group.h" +#include "orbsvcs/PortableGroup/PG_Object_Group.h" #include <orbsvcs/PortableGroup/PG_Utils.h> ACE_RCSID (PortableGroup, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h index 23bb431a92c..b9bd1309492 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PG_Object_Group_Manipulator.h" +#include "orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h" #include "orbsvcs/PortableGroupC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp index 041f605bb85..dc93a9e2e2c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp @@ -1,7 +1,7 @@ -#include "PG_Group_Guard.h" +#include "orbsvcs/PortableGroup/PG_Group_Guard.h" -#include "PG_GenericFactory.h" -#include "PG_ObjectGroupManager.h" +#include "orbsvcs/PortableGroup/PG_GenericFactory.h" +#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" ACE_RCSID (PortableGroup, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h index 3c0d719f243..2c6ca8fe9ee 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h @@ -22,7 +22,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PG_Factory_Set.h" +#include "orbsvcs/PortableGroup/PG_Factory_Set.h" #include "tao/PortableServer/PortableServerC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp index c95f86292b3..2fc8e11dadc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp @@ -1,11 +1,11 @@ // -*- C++ -*- -#include "PG_Location_Equal_To.h" +#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" ACE_RCSID (PortableGroup, PG_Location_Equal_To, "$Id$") #if !defined (__ACE_INLINE__) -#include "PG_Location_Equal_To.inl" +#include "orbsvcs/PortableGroup/PG_Location_Equal_To.inl" #endif /* !__ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h index 7d7014f5437..cbfc12a8949 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h @@ -22,8 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PG_Operators.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/PG_Operators.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "orbsvcs/PortableGroupC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -51,7 +51,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "PG_Location_Equal_To.inl" +#include "orbsvcs/PortableGroup/PG_Location_Equal_To.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp index e4d1f963ba3..0197726bfe8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp @@ -2,10 +2,10 @@ // // $Id$ -#include "PG_Location_Hash.h" +#include "orbsvcs/PortableGroup/PG_Location_Hash.h" #if !defined (__ACE_INLINE__) -#include "PG_Location_Hash.inl" +#include "orbsvcs/PortableGroup/PG_Location_Hash.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (PortableGroup, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h index f39d7b72f7e..d59b5320ff0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "orbsvcs/PortableGroupC.h" #include "ace/ACE.h" @@ -45,7 +45,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "PG_Location_Hash.inl" +#include "orbsvcs/PortableGroup/PG_Location_Hash.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h index 44df85af5f0..e0eb6dbf756 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h @@ -22,8 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PG_Location_Hash.h" -#include "PG_Location_Equal_To.h" +#include "orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "orbsvcs/PortableGroupC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp index 791ca59e531..1485e8277d9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp @@ -1,5 +1,5 @@ -#include "PG_MemberInfo.h" -#include "PG_Operators.h" +#include "orbsvcs/PortableGroup/PG_MemberInfo.h" +#include "orbsvcs/PortableGroup/PG_Operators.h" ACE_RCSID (PortableGroup, PG_MemberInfo, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp index 71e7d62a7f6..5251b3d7931 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp @@ -1,4 +1,4 @@ -#include "PG_Null_Property_Validator.h" +#include "orbsvcs/PortableGroup/PG_Null_Property_Validator.h" ACE_RCSID (PortableGroup, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h index 7498b80d110..41047a90c99 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index d80c190e564..7b78ef895bc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -1,7 +1,7 @@ -#include "PG_ObjectGroupManager.h" -#include "PG_GenericFactory.h" -#include "PG_conf.h" -#include "PG_Operators.h" +#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" +#include "orbsvcs/PortableGroup/PG_GenericFactory.h" +#include "orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/PortableGroup/PG_Operators.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index c7a3c4a9fd9..b78cc4028f3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -16,15 +16,15 @@ #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "orbsvcs/PortableGroupS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PG_ObjectGroup_Map.h" -#include "PG_Location_Map.h" +#include "orbsvcs/PortableGroup/PG_ObjectGroup_Map.h" +#include "orbsvcs/PortableGroup/PG_Location_Map.h" #include "tao/PortableServer/Key_Adapters.h" #include "tao/PortableServer/PortableServerC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h index b7cd89c309b..4673a79df0f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PG_MemberInfo.h" +#include "orbsvcs/PortableGroup/PG_MemberInfo.h" #include "orbsvcs/PortableGroupC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp index 38ae410781b..f8545615ad6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "PG_Object_Adapter_Factory.h" -#include "PG_Servant_Dispatcher.h" +#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h" +#include "orbsvcs/PortableGroup/PG_Servant_Dispatcher.h" #include "tao/PortableServer/Object_Adapter.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h index c7367fbe3fa..7edf4fe521e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h @@ -14,7 +14,7 @@ #define TAO_PG_OBJECT_ADAPTER_FACTORY_H #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "tao/PortableServer/Object_Adapter_Factory.h" #include "tao/orbconf.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index 9f0c391869c..8b7f405ada9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "PG_Object_Group.h" -#include "PG_conf.h" +#include "orbsvcs/PortableGroup/PG_Object_Group.h" +#include "orbsvcs/PortableGroup/PG_conf.h" -#include "PG_Operators.h" // Borrow operator== on CosNaming::Name -#include "PG_Utils.h" +#include "orbsvcs/PortableGroup/PG_Operators.h" // Borrow operator== on CosNaming::Name +#include "orbsvcs/PortableGroup/PG_Utils.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index 61606a2548c..e0c9d524494 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -21,7 +21,7 @@ #define TAO_PG_OBJECT_GROUP_H_ #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -30,10 +30,10 @@ ///////////////////////////////// // Includes needed by this header -#include "PG_Property_Set.h" -#include "PG_Location_Hash.h" -#include "PG_Location_Equal_To.h" -#include "PG_Object_Group_Manipulator.h" +#include "orbsvcs/PortableGroup/PG_Property_Set.h" +#include "orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h" #include "orbsvcs/PortableGroupC.h" #include "tao/PortableServer/PortableServer.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp index 64e04299f31..2fb57ae571a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp @@ -10,8 +10,8 @@ */ //============================================================================= -#include "PG_Object_Group_Manipulator.h" -#include "PG_Utils.h" +#include "orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h" +#include "orbsvcs/PortableGroup/PG_Utils.h" #include "tao/debug.h" #include <ace/OS_NS_stdio.h> diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h index 85f734f442c..4397cbfe8e0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp index 4e16737bc2f..9513dc724bb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp @@ -1,4 +1,4 @@ -#include "PG_Operators.h" +#include "orbsvcs/PortableGroup/PG_Operators.h" #include "ace/OS_NS_string.h" ACE_RCSID (PortableGroup, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h index b6d7097b7e9..6218b5da005 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp index 8e3f140b8a4..de1fa1c7223 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp @@ -10,11 +10,11 @@ * @author Dale Wilson <wilson_d@ociweb.com> */ //============================================================================= -#include "PG_Properties_Encoder.h" +#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" #if ! defined (__ACE_INLINE__) -#include "PG_Properties_Encoder.inl" +#include "orbsvcs/PortableGroup/PG_Properties_Encoder.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h index 92736c4f28f..d1780105873 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h @@ -22,7 +22,7 @@ #include "orbsvcs/PortableGroupS.h" #include "orbsvcs/CosNamingC.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "ace/Vector_T.h" #include "ace/SString.h" @@ -95,7 +95,7 @@ namespace TAO_PG TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "PG_Properties_Encoder.inl" +#include "orbsvcs/PortableGroup/PG_Properties_Encoder.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif // TAO_PG_PROPERTIES_ENCODER_H diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp index 49235842db3..cc8d023d899 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp @@ -12,7 +12,7 @@ */ //============================================================================= -#include "PG_Properties_Support.h" +#include "orbsvcs/PortableGroup/PG_Properties_Support.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h index c49f5990c5b..50e2f504ffd 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h @@ -18,8 +18,8 @@ #ifndef TAO_PG_PROPERTIES_SUPPORT_H #define TAO_PG_PROPERTIES_SUPPORT_H -#include "PG_Property_Set.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/PG_Property_Set.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp index 57ca310be82..f6d9fb2a13c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp @@ -1,8 +1,8 @@ // -*- C++ -*- -#include "PG_PropertyManager.h" -#include "PG_ObjectGroupManager.h" -#include "PG_Property_Utils.h" +#include "orbsvcs/PortableGroup/PG_PropertyManager.h" +#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" +#include "orbsvcs/PortableGroup/PG_Property_Utils.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h index 7fe33a7f00c..5d6c40fa063 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h @@ -21,8 +21,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PG_Default_Property_Validator.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/PG_Default_Property_Validator.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "orbsvcs/PortableGroupS.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp index 6b99b964ba7..e63ff905d9d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp @@ -13,7 +13,7 @@ * @author Dale Wilson <wilson_d@ociweb.com> */ //============================================================================= -#include "PG_Property_Set.h" +#include "orbsvcs/PortableGroup/PG_Property_Set.h" #include "tao/debug.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -250,7 +250,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL //#define PG_PS_UNIT_TEST #ifdef PG_PS_UNIT_TEST -#include "PG_Properties_Encoder.h" +#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h index 043e7644b95..44aae869da7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h @@ -21,7 +21,7 @@ #define TAO_PG_PROPERTY_SET #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "orbsvcs/PortableGroupS.h" #include "orbsvcs/CosNamingC.h" #include "ace/Hash_Map_Manager.h" @@ -193,7 +193,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL //////////////////////////////////// // include templated helper function -#include "PG_Property_Set_Find.h" +#include "orbsvcs/PortableGroup/PG_Property_Set_Find.h" #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h index 9b28b1fc4ed..6f68524d8ac 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "ace/Hash_Map_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp index 49a4e08bfde..897facce517 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp @@ -1,5 +1,5 @@ -#include "PG_Property_Utils.h" -#include "PG_Operators.h" +#include "orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "orbsvcs/PortableGroup/PG_Operators.h" ACE_RCSID (PortableGroup, PG_Property_Utils, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h index b7404c53c41..8e8395f2bc6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h @@ -22,7 +22,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "orbsvcs/PortableGroupC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp index acdaa982a50..1c2b3a94b21 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "GOA.h" -#include "PG_Servant_Dispatcher.h" +#include "orbsvcs/PortableGroup/GOA.h" +#include "orbsvcs/PortableGroup/PG_Servant_Dispatcher.h" ACE_RCSID(PortableGroup, PG_Servant_Dispatcher, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h index ed26a3b980a..c8c80d87a7f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h @@ -14,7 +14,7 @@ #define TAO_PG_SERVANT_DISPATCHER_H #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "tao/PortableServer/Servant_Dispatcher.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp index 988e0eff5dc..a57079ffea8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp @@ -1,4 +1,4 @@ -#include "PG_Utils.h" +#include "orbsvcs/PortableGroup/PG_Utils.h" #include "tao/MProfile.h" #include "tao/Profile.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h index cd9af20cab9..5552f38c3a3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp index fb657e5e881..a22594ca04b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "PortableGroup_Acceptor_Registry.h" +#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h" #include "tao/ORB_Core.h" #include "tao/Profile.h" #include "tao/Protocol_Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h index 4b8a1c87c15..1ecc90efa4d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h @@ -25,7 +25,7 @@ #include "ace/CORBA_macros.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #include "tao/Transport_Acceptor.h" #include "tao/Resource_Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp index b2fb4c1aaf4..2878d3db9a6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "PortableGroup_Loader.h" -#include "PG_Object_Adapter_Factory.h" -#include "PortableGroup_ORBInitializer.h" +#include "orbsvcs/PortableGroup/PortableGroup_Loader.h" +#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h" +#include "orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h" #include "ace/Dynamic_Service.h" #include "tao/ORB_Core.h" #include "tao/ORBInitializer_Registry.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h index 6f67d8b8286..7dac70972c2 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp index 1472511d2e1..870c6b75e59 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "PortableGroup_ORBInitializer.h" -#include "PortableGroup_Request_Dispatcher.h" +#include "orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h" +#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h" #include "tao/Exception.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h index fa27eb6df7c..56f730edd59 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp index 73c78597e50..ae3fbe2d941 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "UIPMC_Profile.h" -#include "PortableGroup_Request_Dispatcher.h" -#include "PortableGroup_Loader.h" +#include "orbsvcs/PortableGroup/UIPMC_Profile.h" +#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h" +#include "orbsvcs/PortableGroup/PortableGroup_Loader.h" #include "tao/TAO_Server_Request.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h index 11b2450218f..fb6ae13e934 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h @@ -20,9 +20,9 @@ #include "tao/Request_Dispatcher.h" -#include "portablegroup_export.h" -#include "Portable_Group_Map.h" -#include "PortableGroup_Acceptor_Registry.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "orbsvcs/PortableGroup/Portable_Group_Map.h" +#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index 631ae66e906..73745a4460b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Portable_Group_Map.h" +#include "orbsvcs/PortableGroup/Portable_Group_Map.h" #include "tao/ORB_Core.h" #include "tao/TAO_Server_Request.h" #include "tao/CDR.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h index 898e3663ff9..c6c69ae9e11 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp index 28162b3fded..8db8a3e7687 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp @@ -2,8 +2,8 @@ // // $Id$ -#include "UIPMC_Profile.h" -#include "UIPMC_Acceptor.h" +#include "orbsvcs/PortableGroup/UIPMC_Profile.h" +#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" @@ -15,7 +15,7 @@ #include "ace/os_include/os_netdb.h" #if !defined(__ACE_INLINE__) -#include "UIPMC_Acceptor.i" +#include "orbsvcs/PortableGroup/UIPMC_Acceptor.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (PortableGroup, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h index 371feec959b..6c783e885c1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "UIPMC_Connection_Handler.h" +#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ #include "ace/Acceptor.h" #include "ace/SOCK_Acceptor.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -153,7 +153,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "UIPMC_Acceptor.i" +#include "orbsvcs/PortableGroup/UIPMC_Acceptor.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp index db49307c2b7..df2fbd006c7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp @@ -3,9 +3,9 @@ // $Id$ -#include "UIPMC_Connection_Handler.h" -#include "UIPMC_Transport.h" -#include "UIPMC_Endpoint.h" +#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h" +#include "orbsvcs/PortableGroup/UIPMC_Transport.h" +#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h" #include "tao/Timeprobe.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h index af548309afb..51153c2d196 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "UIPMC_Transport.h" +#include "orbsvcs/PortableGroup/UIPMC_Transport.h" #include "tao/Wait_Strategy.h" #include "tao/Connection_Handler.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 2bd9ffc58fd..a353451fc9b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "UIPMC_Profile.h" -#include "UIPMC_Connector.h" +#include "orbsvcs/PortableGroup/UIPMC_Profile.h" +#include "orbsvcs/PortableGroup/UIPMC_Connector.h" #include "tao/debug.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h index 49ef29f33a5..43357053bd2 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h @@ -17,13 +17,13 @@ #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "UIPMC_Connection_Handler.h" +#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h" #include "tao/Transport_Connector.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp index ebdc5a5f8df..f10ce5cdafb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "UIPMC_Endpoint.h" +#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h" #include "tao/debug.h" #include "ace/Guard_T.h" @@ -15,7 +15,7 @@ ACE_RCSID (tao, #if !defined (__ACE_INLINE__) -# include "UIPMC_Endpoint.i" +# include "orbsvcs/PortableGroup/UIPMC_Endpoint.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h index 7988f5e29f7..3c137d6c9ef 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h @@ -25,7 +25,7 @@ #include "ace/INET_Addr.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -121,7 +121,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "UIPMC_Endpoint.i" +# include "orbsvcs/PortableGroup/UIPMC_Endpoint.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp index c230cbdf01a..3f02a649f72 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "UIPMC_Factory.h" -#include "UIPMC_Acceptor.h" -#include "UIPMC_Connector.h" +#include "orbsvcs/PortableGroup/UIPMC_Factory.h" +#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h" +#include "orbsvcs/PortableGroup/UIPMC_Connector.h" #include "ace/OS_NS_strings.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h index 9b64f04ba6c..8b7ab75adf2 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h @@ -23,7 +23,7 @@ #include "ace/Service_Config.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp index 553df62769e..4e3d4173fcf 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "UIPMC_Message_Block_Data_Iterator.h" +#include "orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index b3a06759b84..24bf2ad28c7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "UIPMC_Profile.h" -#include "miopconf.h" +#include "orbsvcs/PortableGroup/UIPMC_Profile.h" +#include "orbsvcs/PortableGroup/miopconf.h" #include "tao/CDR.h" #include "tao/Environment.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h index a8442cec252..a6f8846eeb5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h @@ -17,13 +17,13 @@ #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "UIPMC_Endpoint.h" +#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h" #include "orbsvcs/PortableGroupC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp index 0f891dd41ef..bda2c66a8fa 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "UIPMC_Profile.h" -#include "UIPMC_Transport.h" -#include "UIPMC_Connection_Handler.h" -#include "UIPMC_Message_Block_Data_Iterator.h" -#include "UIPMC_Acceptor.h" -#include "UIPMC_Wait_Never.h" +#include "orbsvcs/PortableGroup/UIPMC_Profile.h" +#include "orbsvcs/PortableGroup/UIPMC_Transport.h" +#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h" +#include "orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h" +#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h" +#include "orbsvcs/PortableGroup/UIPMC_Wait_Never.h" #include "tao/Acceptor_Registry.h" #include "tao/operation_details.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h index f887f1dfedf..634b85c0b1a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h @@ -14,7 +14,7 @@ #define TAO_UIPMC_TRANSPORT_H #include /**/ "ace/pre.h" -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp index 13b3556e6db..0e1a0f1bc89 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "UIPMC_Wait_Never.h" +#include "orbsvcs/PortableGroup/UIPMC_Wait_Never.h" #include "tao/ORB_Core.h" #include "tao/Transport.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h index fb688c28951..9f39cd77b91 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portablegroup_export.h" +#include "orbsvcs/PortableGroup/portablegroup_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp index fe09552fce1..d13cfe93576 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp @@ -10,7 +10,7 @@ */ //============================================================================= -#include "RTCosScheduling_ClientScheduler_i.h" +#include "orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp index 60d8e98aa33..2f10810d9c9 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp @@ -10,14 +10,14 @@ */ //============================================================================= -#include "RTCosScheduling_PCP_Manager.h" +#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h" #include "ace/Condition_Thread_Mutex.h" #include "ace/Thread.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #if !defined (__ACE_INLINE__) -#include "RTCosScheduling_PCP_Manager.i" +#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h index d9e25489d8e..b7d3cda9069 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h @@ -300,7 +300,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "RTCosScheduling_PCP_Manager.i" +#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp index df2f202397e..d0fb3c1c07b 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp @@ -8,12 +8,12 @@ */ //============================================================================= -#include "RTCosScheduling_ServerScheduler_i.h" +#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_unistd.h" #if !defined (__ACE_INLINE__) -#include "RTCosScheduling_ServerScheduler_i.i" +#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i" #endif /* __ACE_INLINE__ */ #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h index 367471640fd..beb95c8417c 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h @@ -23,7 +23,7 @@ #include "ace/SString.h" #include <orbsvcs/RTCosSchedulingS.h> #include <orbsvcs/RTCosScheduling/RTCosScheduling_export.h> -#include "RTCosScheduling_PCP_Manager.h" +#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h" #include "tao/PortableInterceptorC.h" #include "tao/CodecFactory/CodecFactory.h" #include "tao/LocalObject.h" @@ -299,7 +299,7 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter< TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "RTCosScheduling_ServerScheduler_i.i" +#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp index bdf0d871878..89bea659c76 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp @@ -1,4 +1,4 @@ -#include "IIOP_SSL_Acceptor.h" +#include "orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h" #include "tao/ORB_Core.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h index 5b7efb1c74f..951e2ab73be 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "IIOP_SSL_Connection_Handler.h" +#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp index c8c3d66531f..fb9a61ba32b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp @@ -1,6 +1,6 @@ -#include "IIOP_SSL_Connection_Handler.h" -#include "IIOP_SSL_Transport.h" -#include "SSLIOP_Connection_Handler.h" +#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h" +#include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h" +#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" #include "tao/Timeprobe.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" @@ -13,7 +13,7 @@ ACE_RCSID (SSLIOP, #if !defined (__ACE_INLINE__) -#include "IIOP_SSL_Connection_Handler.inl" +#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_ENABLE_TIMEPROBES) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h index 8d5e64694ad..3c81122ede9 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_Current.h" +#include "orbsvcs/SSLIOP/SSLIOP_Current.h" #include "orbsvcs/SSLIOPC.h" #include "tao/IIOP_Connection_Handler.h" @@ -113,7 +113,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "IIOP_SSL_Connection_Handler.inl" +#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index d8bfb80dee0..51a3db9a486 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -1,4 +1,4 @@ -#include "IIOP_SSL_Connector.h" +#include "orbsvcs/SSLIOP/IIOP_SSL_Connector.h" #include "tao/debug.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h index 722505eb16c..b051fa19cae 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "IIOP_SSL_Connection_Handler.h" +#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp index a30defe3da7..1a5d1724a2e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp @@ -1,6 +1,6 @@ -#include "IIOP_SSL_Transport.h" -#include "IIOP_SSL_Connection_Handler.h" -#include "SSLIOP_Util.h" +#include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h" +#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h" +#include "orbsvcs/SSLIOP/SSLIOP_Util.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h index d7cfcc1f9de..a6c1aa7ea0f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "SSLIOP_Current.h" +#include "orbsvcs/SSLIOP/SSLIOP_Current.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp index 17351b87747..20845593237 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp @@ -1,4 +1,4 @@ -#include "SSLIOP_Accept_Strategy.h" +#include "orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h" ACE_RCSID (SSLIOP, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h index a4a70efceff..0ce82cca857 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_Connection_Handler.h" +#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp index 822f7fea63a..b4cd56e4806 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp @@ -1,5 +1,5 @@ -#include "SSLIOP_Acceptor.h" -#include "SSLIOP_Profile.h" +#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h" +#include "orbsvcs/SSLIOP/SSLIOP_Profile.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" @@ -9,7 +9,7 @@ #include "tao/debug.h" #if !defined(__ACE_INLINE__) -#include "SSLIOP_Acceptor.i" +#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h index 0dfd1f147f5..f8c12442dc3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h @@ -26,9 +26,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IIOP_SSL_Acceptor.h" -#include "SSLIOP_Connection_Handler.h" -#include "SSLIOP_Accept_Strategy.h" +#include "orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h" +#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" +#include "orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h" #include "orbsvcs/SSLIOPC.h" /* CSIv1 */ #include "orbsvcs/CSIIOPC.h" /* CSIv2 */ @@ -161,7 +161,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "SSLIOP_Acceptor.i" +#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp index 629815c3147..4cf1fe799fb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "SSLIOP_ClientCredentials.h" -#include "SSLIOP_OwnCredentials.h" +#include "orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h" +#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h" ACE_RCSID (SSLIOP, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp index 87197731cba..3d652c1df81 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp @@ -1,6 +1,6 @@ -#include "SSLIOP_Connection_Handler.h" -#include "SSLIOP_Endpoint.h" -#include "SSLIOP_Util.h" +#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" +#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h" +#include "orbsvcs/SSLIOP/SSLIOP_Util.h" #include "tao/debug.h" #include "tao/Base_Transport_Property.h" @@ -15,7 +15,7 @@ #include "ace/os_include/os_netdb.h" #if !defined (__ACE_INLINE__) -# include "SSLIOP_Connection_Handler.i" +# include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (SSLIOP, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h index 36f58cdf26f..9ce3ba997af 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h @@ -23,8 +23,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_Current.h" -#include "SSLIOP_Transport.h" +#include "orbsvcs/SSLIOP/SSLIOP_Current.h" +#include "orbsvcs/SSLIOP/SSLIOP_Transport.h" #include "tao/Connection_Handler.h" #include "tao/IIOPC.h" @@ -193,7 +193,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "SSLIOP_Connection_Handler.i" +#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 4df66a36d9e..9d67b651a5d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -1,7 +1,7 @@ -#include "SSLIOP_Connector.h" -#include "SSLIOP_OwnCredentials.h" -#include "SSLIOP_Profile.h" -#include "SSLIOP_X509.h" +#include "orbsvcs/SSLIOP/SSLIOP_Connector.h" +#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h" +#include "orbsvcs/SSLIOP/SSLIOP_Profile.h" +#include "orbsvcs/SSLIOP/SSLIOP_X509.h" #include "orbsvcs/SecurityLevel2C.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h index aefc3efc7f2..99578662196 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h @@ -25,8 +25,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IIOP_SSL_Connector.h" -#include "SSLIOP_Connection_Handler.h" +#include "orbsvcs/SSLIOP/IIOP_SSL_Connector.h" +#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" #include "ace/SSL/SSL_SOCK_Connector.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp index e75990c0fab..9f8804ad604 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp @@ -1,4 +1,4 @@ -#include "SSLIOP_Credentials.h" +#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h" #include "tao/ORB_Constants.h" @@ -11,7 +11,7 @@ ACE_RCSID (SSLIOP, #if !defined (__ACE_INLINE__) -# include "SSLIOP_Credentials.inl" +# include "orbsvcs/SSLIOP/SSLIOP_Credentials.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index b8e40ab99f8..c60f0ce5d68 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -15,14 +15,14 @@ #include /**/ "ace/pre.h" -#include "SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_X509.h" -#include "SSLIOP_EVP_PKEY.h" +#include "orbsvcs/SSLIOP/SSLIOP_X509.h" +#include "orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h" #include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" @@ -175,7 +175,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "SSLIOP_Credentials.inl" +# include "orbsvcs/SSLIOP/SSLIOP_Credentials.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp index e3c6c3c2d38..1858e9a3b1b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "SSLIOP_CredentialsAcquirer.h" -#include "SSLIOP_OwnCredentials.h" +#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h" +#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp index 4f86ddb3c6a..06ac8c86977 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "SSLIOP_CredentialsAcquirerFactory.h" -#include "SSLIOP_CredentialsAcquirer.h" +#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h" +#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h" ACE_RCSID (SSLIOP, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp index 4e4de7a7b5a..9d39c05ba21 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp @@ -1,4 +1,4 @@ -#include "SSLIOP_Current.h" +#include "orbsvcs/SSLIOP/SSLIOP_Current.h" #include "tao/debug.h" @@ -8,7 +8,7 @@ ACE_RCSID (SSLIOP, #if !defined (__ACE_INLINE__) -# include "SSLIOP_Current.inl" +# include "orbsvcs/SSLIOP/SSLIOP_Current.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index dd949232f3a..2de37f5cbc6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_Current_Impl.h" +#include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.h" #include "orbsvcs/SSLIOPC.h" #include "tao/ORB_Core.h" @@ -163,7 +163,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "SSLIOP_Current.inl" +# include "orbsvcs/SSLIOP/SSLIOP_Current.inl" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp index a756b452cd0..27f173dfaac 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp @@ -1,4 +1,4 @@ -#include "SSLIOP_Current_Impl.h" +#include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.h" #include "ace/OS_String.h" @@ -9,11 +9,11 @@ ACE_RCSID (SSLIOP, #if !defined (__ACE_INLINE__) -# include "SSLIOP_Current_Impl.inl" +# include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl" #endif /* __ACE_INLINE__ */ -#include "SSLIOP_X509.h" -#include "SSLIOP_ClientCredentials.h" +#include "orbsvcs/SSLIOP/SSLIOP_X509.h" +#include "orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h index bb28f0d1596..32bc8c7a283 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h @@ -105,7 +105,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "SSLIOP_Current_Impl.inl" +# include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp index 00170aa76ff..020904b53d2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp @@ -1,12 +1,12 @@ // -*- C++ -*- -#include "SSLIOP_EVP_PKEY.h" +#include "orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h" #include <openssl/x509.h> #include <openssl/rsa.h> #include <openssl/dsa.h> #include <openssl/dh.h> -#include "params_dup.h" +#include "orbsvcs/SSLIOP/params_dup.h" ACE_RCSID (SSLIOP, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h index 2dea793edc5..8c43b8a5b68 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h @@ -21,7 +21,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_OpenSSL_st_T.h" +#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h" #include <openssl/evp.h> #include <openssl/crypto.h> diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp index a10bb155e93..62061e03009 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp @@ -1,4 +1,4 @@ -#include "SSLIOP_Endpoint.h" +#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h" #include "tao/IIOP_Endpoint.h" @@ -14,7 +14,7 @@ ACE_RCSID (SSLIOP, #if !defined (__ACE_INLINE__) -# include "SSLIOP_Endpoint.i" +# include "orbsvcs/SSLIOP/SSLIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h index d1ba9e7086d..a7032ee4648 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h @@ -18,13 +18,13 @@ #include /**/ "ace/pre.h" -#include "SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_OwnCredentials.h" +#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h" #include "orbsvcs/SSLIOPC.h" #include "orbsvcs/SecurityC.h" @@ -248,7 +248,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "SSLIOP_Endpoint.i" +#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 82cf4db9108..49a369925e7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -1,7 +1,7 @@ -#include "SSLIOP_Factory.h" -#include "SSLIOP_Acceptor.h" -#include "SSLIOP_Connector.h" -#include "SSLIOP_ORBInitializer.h" +#include "orbsvcs/SSLIOP/SSLIOP_Factory.h" +#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h" +#include "orbsvcs/SSLIOP/SSLIOP_Connector.h" +#include "orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h" #include "ace/OS_NS_strings.h" #include "orbsvcs/Security/Security_ORBInitializer.h" /// @todo should go away diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h index b32a9d67050..169e12b7bf2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp index b6db519398c..5e90c389e80 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp @@ -1,4 +1,4 @@ -#include "SSLIOP_Invocation_Interceptor.h" +#include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h" #include "orbsvcs/SecurityLevel2C.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h index d0eef730127..9ab7aaffad1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index 97bf03157b5..6f36fa774c5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -1,4 +1,4 @@ -#include "SSLIOP_ORBInitializer.h" +#include "orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h" ACE_RCSID (SSLIOP, @@ -6,10 +6,10 @@ ACE_RCSID (SSLIOP, "$Id$") -#include "SSLIOP_Current.h" -#include "SSLIOP_Invocation_Interceptor.h" +#include "orbsvcs/SSLIOP/SSLIOP_Current.h" +#include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h" //#include "SSLIOP_IORInterceptor.h" -#include "SSLIOP_CredentialsAcquirerFactory.h" +#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h" #include "orbsvcs/Security/SL3_SecurityCurrent.h" #include "orbsvcs/Security/SL3_CredentialsCurator.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h index 12180c7aaa3..905b526d000 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp index 970d2201160..f20eb554f4c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp @@ -3,7 +3,7 @@ #ifndef TAO_SSLIOP_OPENSSL_ST_T_CPP #define TAO_SSLIOP_OPENSSL_ST_T_CPP -#include "SSLIOP_OpenSSL_st_T.h" +#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -11,7 +11,7 @@ #if !defined (__ACE_INLINE__) -#include "SSLIOP_OpenSSL_st_T.inl" +#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl" #endif /* !__ACE_INLINE__ */ #endif /* TAO_SSLIOP_OPENSSL_ST_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h index 1697e836d81..1fee4c1504b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h @@ -123,11 +123,11 @@ TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "SSLIOP_OpenSSL_st_T.inl" +#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "SSLIOP_OpenSSL_st_T.cpp" +# include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp index 8817457d263..7d90833fff5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "SSLIOP_OwnCredentials.h" +#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h" ACE_RCSID (SSLIOP, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h index 46642bc3a4a..fd88fc7ce2a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_Credentials.h" +#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp index cdb965396d0..f9c084779cd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp @@ -1,5 +1,5 @@ -#include "SSLIOP_Profile.h" -#include "ssl_endpointsC.h" +#include "orbsvcs/SSLIOP/SSLIOP_Profile.h" +#include "orbsvcs/SSLIOP/ssl_endpointsC.h" #include "tao/CDR.h" #include "tao/Environment.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h index 033ca4c2c4c..849914f148d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_Endpoint.h" +#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h" #include "tao/IIOP_Profile.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h index 94e9d595f59..b9b01e4a85d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h @@ -23,7 +23,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_OpenSSL_st_T.h" +#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h" #include <openssl/ssl.h> #include <openssl/crypto.h> diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp index 3403406acd0..a081a95c168 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp @@ -1,4 +1,4 @@ -#include "SSLIOP_TargetCredentials.h" +#include "orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h" ACE_RCSID (SSLIOP, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h index 951d2139ad9..920db9d2e61 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_Credentials.h" +#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index 63e82a2003c..d31206b7a2c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -1,7 +1,7 @@ -#include "SSLIOP_Connection_Handler.h" -#include "SSLIOP_Transport.h" -#include "SSLIOP_Profile.h" -#include "SSLIOP_Acceptor.h" +#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" +#include "orbsvcs/SSLIOP/SSLIOP_Transport.h" +#include "orbsvcs/SSLIOP/SSLIOP_Profile.h" +#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h index d9d6fd77600..fec7a5ee95f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp index 9aa0756e081..385e58f64e2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp @@ -1,4 +1,4 @@ -#include "SSLIOP_Util.h" +#include "orbsvcs/SSLIOP/SSLIOP_Util.h" ACE_RCSID (SSLIOP, @@ -6,8 +6,8 @@ ACE_RCSID (SSLIOP, "$Id$") -#include "SSLIOP_Connection_Handler.h" -#include "SSLIOP_Current.h" +#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" +#include "orbsvcs/SSLIOP/SSLIOP_Current.h" #include "tao/ORB_Core.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h index aec7af349c8..15e3e5f1545 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_Current.h" +#include "orbsvcs/SSLIOP/SSLIOP_Current.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h index def6d0bfa62..fc46e69fa9c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h @@ -21,7 +21,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SSLIOP_OpenSSL_st_T.h" +#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h" #include <openssl/x509.h> #include <openssl/crypto.h> diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp index 14cc75ef1fb..a9e2d63a88d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp @@ -34,7 +34,7 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "ssl_endpointsC.h" +#include "orbsvcs/SSLIOP/ssl_endpointsC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index d98076e17a1..c8c56c6b5ac 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -7,7 +7,7 @@ #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/Scheduler_Factory.h" -#include "Config_Scheduler.h" +#include "orbsvcs/Sched/Config_Scheduler.h" ACE_RCSID(Sched, Config_Scheduler, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index aea4c970803..d6b378d8f82 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -16,7 +16,7 @@ #include "orbsvcs/RtecSchedulerS.h" #include "orbsvcs/Event_Service_Constants.h" -#include "sched_export.h" +#include "orbsvcs/Sched/sched_export.h" #if defined (TAO_USES_STRATEGY_SCHEDULER) #include "orbsvcs/Sched/Strategy_Scheduler.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index 0e3de992a7f..69b1e25ddca 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -16,14 +16,14 @@ // // ============================================================================ -#include "DynSched.h" +#include "orbsvcs/Sched/DynSched.h" #include "ace/Basic_Types.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_stdio.h" #include "ace/Null_Mutex.h" #if ! defined (__ACE_INLINE__) -#include "DynSched.i" +#include "orbsvcs/Sched/DynSched.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Sched, DynSched, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h index a65ffb688ca..bae77c581a2 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h @@ -31,8 +31,8 @@ #include "ace/Map_Manager.h" #include "ace/Message_Block.h" #include "ace/SString.h" -#include "SchedEntry.h" -#include "sched_export.h" +#include "orbsvcs/Sched/SchedEntry.h" +#include "orbsvcs/Sched/sched_export.h" #include "ace/Recursive_Thread_Mutex.h" @@ -535,7 +535,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "DynSched.i" +#include "orbsvcs/Sched/DynSched.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp index 271069bbc73..f3669c611c5 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp @@ -18,8 +18,8 @@ #ifndef TAO_RECONFIG_SCHED_UTILS_C #define TAO_RECONFIG_SCHED_UTILS_C -#include "Reconfig_Sched_Utils_T.h" -#include "Reconfig_Sched_Utils.h" +#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.h" +#include "orbsvcs/Sched/Reconfig_Sched_Utils.h" #include "orbsvcs/Time_Utilities.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h index 15cb0468d37..408d42bb56f 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h @@ -27,7 +27,7 @@ #include "orbsvcs/Scheduler_Factory.h" #include "orbsvcs/RtecSchedulerS.h" -#include "sched_export.h" +#include "orbsvcs/Sched/sched_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -663,7 +663,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL // Include the templates here. -#include "Reconfig_Sched_Utils_T.h" +#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.h" #include /**/ "ace/post.h" #endif /* TAO_RECONFIG_SCHED_UTILS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp index 8b64c675a18..cfc7cfd332a 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp @@ -18,7 +18,7 @@ #ifndef TAO_RECONFIG_SCHED_UTILS_T_CPP #define TAO_RECONFIG_SCHED_UTILS_T_CPP -#include "Reconfig_Sched_Utils_T.h" +#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.h" #include "ace/Sched_Params.h" #include "ace/ACE.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h index af2ce071f89..b66b0f389bd 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" #include "ace/config-all.h" -#include "Reconfig_Sched_Utils.h" +#include "orbsvcs/Sched/Reconfig_Sched_Utils.h" #include "ace/Hash_Map_Manager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -479,7 +479,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Reconfig_Sched_Utils_T.cpp" +#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h index ba2cdcb82dd..1734634a104 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h @@ -25,14 +25,14 @@ #include "ace/RB_Tree.h" #include "orbsvcs/Scheduler_Factory.h" #include "orbsvcs/RtecSchedulerS.h" -#include "Reconfig_Sched_Utils.h" +#include "orbsvcs/Sched/Reconfig_Sched_Utils.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // Include the templates here. -#include "Reconfig_Scheduler_T.h" +#include "orbsvcs/Sched/Reconfig_Scheduler_T.h" #include /**/ "ace/post.h" #endif /* TAO_RECONFIG_SCHEDULER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index 0bd5ac9febf..30ecef686cd 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -18,7 +18,7 @@ #ifndef TAO_RECONFIG_SCHEDULER_T_C #define TAO_RECONFIG_SCHEDULER_T_C -#include "Reconfig_Scheduler_T.h" +#include "orbsvcs/Sched/Reconfig_Scheduler_T.h" #include "orbsvcs/Time_Utilities.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h index 44101a29878..e0548b6cd7d 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h @@ -20,7 +20,7 @@ #include "ace/config-all.h" -#include "Reconfig_Scheduler.h" +#include "orbsvcs/Sched/Reconfig_Scheduler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -765,7 +765,7 @@ maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array, TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Reconfig_Scheduler_T.cpp" +#include "orbsvcs/Sched/Reconfig_Scheduler_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp index 852504b93f7..5dc53ae9ffb 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp @@ -16,12 +16,12 @@ // // ============================================================================ -#include "SchedEntry.h" +#include "orbsvcs/Sched/SchedEntry.h" #include "ace/SString.h" #include "ace/OS_NS_stdio.h" #if ! defined (__ACE_INLINE__) -#include "SchedEntry.i" +#include "orbsvcs/Sched/SchedEntry.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(Sched, SchedEntry, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h index 6eeedffd7d8..e84ceb6cad3 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h @@ -22,7 +22,7 @@ #define SCHEDENTRY_H #include /**/ "ace/pre.h" -#include "sched_export.h" +#include "orbsvcs/Sched/sched_export.h" #include "orbsvcs/RtecSchedulerC.h" #include "orbsvcs/Event_Service_Constants.h" #include "ace/Containers.h" @@ -639,7 +639,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "SchedEntry.i" +#include "orbsvcs/Sched/SchedEntry.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp index 5c6eb041289..13ecbf74fc0 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp @@ -18,7 +18,7 @@ #include "ace/Sched_Params.h" #include "orbsvcs/Time_Utilities.h" -#include "Scheduler.h" +#include "orbsvcs/Sched/Scheduler.h" #include "ace/OS_NS_stdio.h" #include "ace/Lock_Adapter_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h index 745e70ec84c..8cad8d40736 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h @@ -35,7 +35,7 @@ #include "orbsvcs/RtecSchedulerC.h" #include "orbsvcs/Event_Service_Constants.h" -#include "sched_export.h" +#include "orbsvcs/Sched/sched_export.h" class TAO_RTSched_Export ACE_Scheduler // = TITLE diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp index b81bc443a06..69448fa30b6 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp @@ -18,7 +18,7 @@ #include "ace/Sched_Params.h" -#include "Scheduler_Generic.h" +#include "orbsvcs/Sched/Scheduler_Generic.h" #include "ace/OS_NS_stdio.h" ACE_RCSID(Sched, Scheduler_Generic, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h index 9f5b55bc908..1b73b4d1c4b 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h @@ -22,7 +22,7 @@ #define SCHEDULER_INTERNAL_H #include /**/ "ace/pre.h" -#include "Scheduler.h" +#include "orbsvcs/Sched/Scheduler.h" #include "ace/Unbounded_Set.h" #include "ace/Synch_Traits.h" #include "ace/Recursive_Thread_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp index 5ddc6420565..8b27fdbd690 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp @@ -16,7 +16,7 @@ // // ============================================================================ -#include "Strategy_Scheduler.h" +#include "orbsvcs/Sched/Strategy_Scheduler.h" #include "ace/Sched_Params.h" ACE_RCSID (Sched, diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h index 3f8e837ea98..e323855d33e 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h @@ -22,7 +22,7 @@ #define STRATEGY_SCHEDULER_H #include /**/ "ace/pre.h" -#include "DynSched.h" +#include "orbsvcs/Sched/DynSched.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp index a0fab4d2a1f..0e7c1a01478 100644 --- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "CSI_Utils.h" +#include "orbsvcs/Security/CSI_Utils.h" #include "orbsvcs/CSIC.h" #include "tao/CDR.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp index 06fb5262aa8..20216f4a905 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "SL2_EstablishTrustPolicy.h" +#include "orbsvcs/Security/SL2_EstablishTrustPolicy.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h index 7003fd73e3c..b7910c316d9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp index 521a8706db0..9175ac608b0 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "SL2_QOPPolicy.h" +#include "orbsvcs/Security/SL2_QOPPolicy.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h index a94c5040359..ff8b99e2309 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp index b6e9e6380dc..22b8d7ad961 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "SL3_ContextEstablishmentPolicy.h" +#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h" ACE_RCSID (Security, diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp index 6bc147f782e..80a5304154e 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp @@ -1,4 +1,4 @@ -#include "SL3_CredentialsAcquirerFactory.h" +#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h" ACE_RCSID (Security, diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index a20eae8dae7..6555f46469c 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "SL3_CredentialsCurator.h" -#include "SL3_CredentialsAcquirerFactory.h" +#include "orbsvcs/Security/SL3_CredentialsCurator.h" +#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h" ACE_RCSID (Security, diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp index 7517e4ae3b2..69cac1d1ae1 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "SL3_ObjectCredentialsPolicy.h" +#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h" ACE_RCSID (Security, diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp index 456103ca3f8..959a93e4885 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "SL3_PolicyFactory.h" -#include "SL3_ContextEstablishmentPolicy.h" -#include "SL3_ObjectCredentialsPolicy.h" +#include "orbsvcs/Security/SL3_PolicyFactory.h" +#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h" +#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h" ACE_RCSID (Security, diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp index d97987dba63..db6609f803b 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "SL3_SecurityCurrent.h" +#include "orbsvcs/Security/SL3_SecurityCurrent.h" ACE_RCSID (Security, @@ -9,7 +9,7 @@ ACE_RCSID (Security, #if !defined (__ACE_INLINE__) -# include "SL3_SecurityCurrent.inl" +# include "orbsvcs/Security/SL3_SecurityCurrent.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h index c9386dc29b5..b592530c19e 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "SL3_SecurityCurrent_Impl.h" +#include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h" #include "orbsvcs/SecurityLevel3C.h" @@ -140,7 +140,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "SL3_SecurityCurrent.inl" +# include "orbsvcs/Security/SL3_SecurityCurrent.inl" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp index e7dac650073..14b7a548c16 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "SL3_SecurityCurrent_Impl.h" +#include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h" ACE_RCSID (Security, SL3_Security_Current_Impl, diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h index 010d16b54f9..59501c69339 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "security_export.h" +#include "orbsvcs/Security/security_export.h" #include "orbsvcs/SecurityLevel3C.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp index 0aa06b8c5ca..1cf548a4f2e 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "SL3_SecurityManager.h" -#include "SL3_ContextEstablishmentPolicy.h" -#include "SL3_ObjectCredentialsPolicy.h" +#include "orbsvcs/Security/SL3_SecurityManager.h" +#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h" +#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h" ACE_RCSID (Security, diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index 4c52f56e4bb..0470c54ab17 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "Security_Current.h" +#include "orbsvcs/Security/Security_Current.h" #include "tao/debug.h" ACE_RCSID (Security, @@ -8,7 +8,7 @@ ACE_RCSID (Security, "$Id$") #if !defined (__ACE_INLINE__) -# include "Security_Current.inl" +# include "orbsvcs/Security/Security_Current.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index 0f450984d07..118689ca9d4 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,7 +25,7 @@ #include "tao/ORB_Core.h" #include "tao/LocalObject.h" -#include "Security_Current_Impl.h" +#include "orbsvcs/Security/Security_Current_Impl.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -137,7 +137,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Security_Current.inl" +# include "orbsvcs/Security/Security_Current.inl" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp index ef2158ec53f..a0239a9ca7d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "Security_Current_Impl.h" +#include "orbsvcs/Security/Security_Current_Impl.h" ACE_RCSID (Security, SL3_Security_Current_Impl, diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h index 6d1054f2e4b..f92e121fddf 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "security_export.h" +#include "orbsvcs/Security/security_export.h" #include "orbsvcs/SecurityLevel2C.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index 9a61e49415d..396f2116aa0 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "Security_ORBInitializer.h" +#include "orbsvcs/Security/Security_ORBInitializer.h" ACE_RCSID (Security, Security_ORBInitializer, @@ -8,9 +8,9 @@ ACE_RCSID (Security, // #include "Security_Current.h" -#include "SL3_SecurityCurrent.h" -#include "SL3_CredentialsCurator.h" -#include "SL3_SecurityManager.h" +#include "orbsvcs/Security/SL3_SecurityCurrent.h" +#include "orbsvcs/Security/SL3_CredentialsCurator.h" +#include "orbsvcs/Security/SL3_SecurityManager.h" #include "orbsvcs/SecurityC.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h index 8aec1ba210d..c6a17685f4d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,7 +29,7 @@ #include "tao/PI/PI.h" #include "tao/LocalObject.h" -#include "Security_PolicyFactory.h" +#include "orbsvcs/Security/Security_PolicyFactory.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 59e914d0dd0..96f0ddbb787 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -1,16 +1,16 @@ // -*- C++ -*- -#include "Security_PolicyFactory.h" +#include "orbsvcs/Security/Security_PolicyFactory.h" ACE_RCSID (Security, Security_PolicyFactory, "$Id$") -#include "SL2_QOPPolicy.h" -#include "SL2_EstablishTrustPolicy.h" +#include "orbsvcs/Security/SL2_QOPPolicy.h" +#include "orbsvcs/Security/SL2_EstablishTrustPolicy.h" -#include "SL3_ContextEstablishmentPolicy.h" -#include "SL3_ObjectCredentialsPolicy.h" +#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h" +#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h" #include "orbsvcs/SecurityLevel2C.h" #include "orbsvcs/SecurityLevel3C.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h index 234428c364c..24ca4b500db 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp index 65d0c1a3e64..e243dfa2530 100644 --- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Shutdown_Utilities.h" +#include "orbsvcs/Shutdown_Utilities.h" #include "ace/Log_Msg.h" ACE_RCSID(orbsvcs, diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index 7aff9042f90..55708a8dc13 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "TAO_TIO.h" +#include "orbsvcs/Time/TAO_TIO.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h index 9dddb9718ff..ff4f0e8ab36 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h @@ -19,8 +19,8 @@ #include /**/ "ace/pre.h" #include "orbsvcs/TimeServiceS.h" -#include "TAO_UTO.h" -#include "time_export.h" +#include "orbsvcs/Time/TAO_UTO.h" +#include "orbsvcs/Time/time_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp index d5e1c4556de..710c8fad7ee 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -1,9 +1,9 @@ // -*- C++ -*- // $Id$ -#include "TAO_Time_Service_Clerk.h" -#include "TAO_TIO.h" -#include "TAO_UTO.h" +#include "orbsvcs/Time/TAO_Time_Service_Clerk.h" +#include "orbsvcs/Time/TAO_TIO.h" +#include "orbsvcs/Time/TAO_UTO.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h index 78629d2f122..ef8d5a9a3dd 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h @@ -21,8 +21,8 @@ #include "ace/Reactor.h" #include "orbsvcs/TimeServiceS.h" -#include "Timer_Helper.h" -#include "time_export.h" +#include "orbsvcs/Time/Timer_Helper.h" +#include "orbsvcs/Time/time_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index e6afbb21415..6fc4cf2b98e 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -1,6 +1,6 @@ -#include "TAO_UTO.h" -#include "TAO_TIO.h" -#include "TAO_Time_Service_Server.h" +#include "orbsvcs/Time/TAO_UTO.h" +#include "orbsvcs/Time/TAO_TIO.h" +#include "orbsvcs/Time/TAO_Time_Service_Server.h" #include "ace/OS_NS_sys_time.h" #include "orbsvcs/Time_Utilities.h" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h index b23700a5bfe..c87d563935a 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/TimeServiceS.h" -#include "time_export.h" +#include "orbsvcs/Time/time_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index 92356ad597b..c9ea818a549 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -1,8 +1,8 @@ // -*- C++ -*- // $Id$ -#include "TAO_UTO.h" -#include "TAO_TIO.h" +#include "orbsvcs/Time/TAO_UTO.h" +#include "orbsvcs/Time/TAO_TIO.h" #include "ace/OS.h" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h index 4614b2de571..b4e72e090da 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/TimeServiceS.h" -#include "time_export.h" +#include "orbsvcs/Time/time_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 6de610ec506..47923f8dba3 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -1,5 +1,5 @@ -#include "Timer_Helper.h" -#include "TAO_Time_Service_Clerk.h" +#include "orbsvcs/Time/Timer_Helper.h" +#include "orbsvcs/Time/TAO_Time_Service_Clerk.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h index 66f245cc7fd..9bfd7297661 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h @@ -25,7 +25,7 @@ #include "ace/Event_Handler.h" #include "ace/Containers.h" -#include "time_export.h" +#include "orbsvcs/Time/time_export.h" #include "orbsvcs/TimeServiceS.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp index 8b686b5d992..0db71ba50b0 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Constraint_Interpreter.h" -#include "Trader_Constraint_Visitors.h" +#include "orbsvcs/Trader/Constraint_Interpreter.h" +#include "orbsvcs/Trader/Trader_Constraint_Visitors.h" ACE_RCSID (Trader, Constraint_Interpreter, diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index 4c2299a4164..586f82080e4 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -15,9 +15,9 @@ #define TAO_CONSTRAINT_INTERPRETER_H #include /**/ "ace/pre.h" -#include "Constraint_Nodes.h" -#include "Constraint_Visitors.h" -#include "Interpreter.h" +#include "orbsvcs/Trader/Constraint_Nodes.h" +#include "orbsvcs/Trader/Constraint_Visitors.h" +#include "orbsvcs/Trader/Interpreter.h" #include "orbsvcs/CosTradingS.h" #include "orbsvcs/CosTradingReposS.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp index 7955af7fc73..fefcfb8aefc 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Constraint_Nodes.h" -#include "Constraint_Visitors.h" +#include "orbsvcs/Trader/Constraint_Nodes.h" +#include "orbsvcs/Trader/Constraint_Visitors.h" #include "tao/AnyTypeCode/Any.h" #include "tao/Managed_Types.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h index a38b764cf1a..9204494c327 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h @@ -15,7 +15,7 @@ #define TAO_CONSTRAINT_NODES_H #include /**/ "ace/pre.h" -#include "Constraint_Tokens.h" +#include "orbsvcs/Trader/Constraint_Tokens.h" #include "tao/Basic_Types.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp index b679afdc32f..edb16fd97b9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "Constraint_Visitors.h" -#include "Constraint_Nodes.h" -#include "Interpreter_Utils_T.h" +#include "orbsvcs/Trader/Constraint_Visitors.h" +#include "orbsvcs/Trader/Constraint_Nodes.h" +#include "orbsvcs/Trader/Interpreter_Utils_T.h" #include "tao/DynamicAny/DynSequence_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index 6c1452143c2..a451f98e6a9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -424,9 +424,9 @@ TAO_END_VERSIONED_NAMESPACE_DECL // // ======================================================================== -#include "Constraint_Interpreter.h" -#include "Constraint_Nodes.h" -#include "Constraint_Tokens.h" +#include "orbsvcs/Trader/Constraint_Interpreter.h" +#include "orbsvcs/Trader/Constraint_Nodes.h" +#include "orbsvcs/Trader/Constraint_Tokens.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp index d2712ddbd4d..4376a5b05ba 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp @@ -14,8 +14,8 @@ // ======================================================================== #include "ace/OS_NS_string.h" -#include "Constraint_Interpreter.h" -#include "Constraint_Nodes.h" +#include "orbsvcs/Trader/Constraint_Interpreter.h" +#include "orbsvcs/Trader/Constraint_Nodes.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp index f7d01af106f..ff6f7b4a1e4 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Interpreter.h" +#include "orbsvcs/Trader/Interpreter.h" #include "ace/OS_NS_string.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h index 1e4a3747f1d..7971ed9e024 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h @@ -14,8 +14,8 @@ #define TAO_TCL_INTERPRETER_H #include /**/ "ace/pre.h" -#include "Constraint_Nodes.h" -#include "Constraint_Visitors.h" +#include "orbsvcs/Trader/Constraint_Nodes.h" +#include "orbsvcs/Trader/Constraint_Visitors.h" #include "orbsvcs/Trader/trading_serv_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp index 842d51dac11..8ee0351020a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Interpreter_Utils.h" +#include "orbsvcs/Trader/Interpreter_Utils.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h index e7640a3be6e..bbef8857006 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h @@ -16,7 +16,7 @@ CORBA::Boolean TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& operand TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Interpreter_Utils_T.cpp" +#include "orbsvcs/Trader/Interpreter_Utils_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp index ecfd1f67c97..367f7b9a9c5 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp @@ -3,7 +3,7 @@ #ifndef TAO_OFFER_DATABASE_CPP #define TAO_OFFER_DATABASE_CPP -#include "Offer_Database.h" +#include "orbsvcs/Trader/Offer_Database.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h index 46b95189833..915887608bc 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h @@ -15,8 +15,8 @@ #define TAO_OFFER_DATABASE_H #include /**/ "ace/pre.h" -#include "Trader.h" -#include "Offer_Iterators.h" +#include "orbsvcs/Trader/Trader.h" +#include "orbsvcs/Trader/Offer_Iterators.h" #include "ace/Null_Mutex.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index 102bf0b9be9..da8ad797031 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Offer_Iterators.h" +#include "orbsvcs/Trader/Offer_Iterators.h" ACE_RCSID(Trader, Offer_Iterators, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h index 11e6e95860a..247664b6f77 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h @@ -16,7 +16,7 @@ #define TAO_OFFER_ITERATORS_H #include /**/ "ace/pre.h" -#include "Trader_Utils.h" +#include "orbsvcs/Trader/Trader_Utils.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp index 7dba728106a..f8ad8bd3a6f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp @@ -3,7 +3,7 @@ #ifndef TAO_OFFER_ITERATORS_T_CPP #define TAO_OFFER_ITERATORS_T_CPP -#include "Offer_Iterators_T.h" +#include "orbsvcs/Trader/Offer_Iterators_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h index d1b4459e3a9..8aa992e9add 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h @@ -16,8 +16,8 @@ #define TAO_REGISTER_OFFER_ITERATOR_H #include /**/ "ace/pre.h" -#include "Offer_Iterators.h" -#include "Offer_Database.h" +#include "orbsvcs/Trader/Offer_Iterators.h" +#include "orbsvcs/Trader/Offer_Database.h" #if defined(_MSC_VER) #pragma warning(push) @@ -85,7 +85,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Offer_Iterators_T.cpp" +#include "orbsvcs/Trader/Offer_Iterators_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp index cf7cccce4a1..f596627fda1 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Service_Type_Repository.h" +#include "orbsvcs/Trader/Service_Type_Repository.h" #include "ace/Lock_Adapter_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index cb34acd9be4..013061face7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -16,7 +16,7 @@ #define TAO_SERVICE_TYPE_REPOSITORY_H #include /**/ "ace/pre.h" -#include "Trader.h" +#include "orbsvcs/Trader/Trader.h" #include "ace/Hash_Map_Manager.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp index 769c5485231..14d035ee0e5 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Trader.h" -#include "Offer_Iterators_T.h" +#include "orbsvcs/Trader/Trader.h" +#include "orbsvcs/Trader/Offer_Iterators_T.h" #include "ace/Thread_Mutex.h" #include "ace/RW_Thread_Mutex.h" #include "ace/OS_NS_strings.h" @@ -9,7 +9,7 @@ #include "ace/OS_NS_ctype.h" // The following #include is needed only for the instantiation pragmas. -#include "Trader_Interfaces.h" +#include "orbsvcs/Trader/Trader_Interfaces.h" ACE_RCSID (Trader, Trader, @@ -637,7 +637,7 @@ operator== (const CosTrading::Admin::OctetSeq& left, TAO_END_VERSIONED_NAMESPACE_DECL #include "ace/Arg_Shifter.h" -#include "Trader_T.h" +#include "orbsvcs/Trader/Trader_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index eac0af63978..33206bd58fb 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -17,7 +17,7 @@ #define TAO_TRADER_BASE_H #include /**/ "ace/pre.h" -#include "Interpreter_Utils.h" +#include "orbsvcs/Trader/Interpreter_Utils.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp index 23372d9bd5c..89c0ec8e1e5 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Trader_Constraint_Visitors.h" +#include "orbsvcs/Trader/Trader_Constraint_Visitors.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h index 8c77cfdf193..3b132230630 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h @@ -15,9 +15,9 @@ #define TAO_TRADER_CONSTRAINT_VISITOR_H #include /**/ "ace/pre.h" -#include "Constraint_Visitors.h" -#include "Trader.h" -#include "Trader_Utils.h" +#include "orbsvcs/Trader/Constraint_Visitors.h" +#include "orbsvcs/Trader/Trader.h" +#include "orbsvcs/Trader/Trader_Utils.h" #include "orbsvcs/CosTradingC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index cbe28b4b7e1..60302dcbdbc 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -3,10 +3,10 @@ #ifndef TAO_TRADER_INTERFACES_CPP #define TAO_TRADER_INTERFACES_CPP -#include "Trader_Interfaces.h" -#include "Trader_T.h" +#include "orbsvcs/Trader/Trader_Interfaces.h" +#include "orbsvcs/Trader/Trader_T.h" #include "ace/INET_Addr.h" -#include "Trader_Constraint_Visitors.h" +#include "orbsvcs/Trader/Trader_Constraint_Visitors.h" #include "ace/OS_NS_time.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index 9ae04cb0df1..6094c58550e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -17,9 +17,9 @@ #define TAO_TRADER_INTERFACES_H #include /**/ "ace/pre.h" -#include "Trader_Utils.h" -#include "Constraint_Interpreter.h" -#include "Offer_Iterators_T.h" +#include "orbsvcs/Trader/Trader_Utils.h" +#include "orbsvcs/Trader/Constraint_Interpreter.h" +#include "orbsvcs/Trader/Offer_Iterators_T.h" #if defined(_MSC_VER) #pragma warning(push) @@ -43,7 +43,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Link; TAO_END_VERSIONED_NAMESPACE_DECL -#include "Trader_T.h" +#include "orbsvcs/Trader/Trader_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp index 4d41e22bd51..74c5a327976 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp @@ -3,8 +3,8 @@ #ifndef TAO_TRADER_CPP #define TAO_TRADER_CPP -#include "Trader_T.h" -#include "Trader_Interfaces.h" +#include "orbsvcs/Trader/Trader_T.h" +#include "orbsvcs/Trader/Trader_Interfaces.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index bce823d2343..cf892279bcc 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -17,8 +17,8 @@ #define TAO_TRADER_H #include /**/ "ace/pre.h" -#include "Trader.h" -#include "Offer_Database.h" +#include "orbsvcs/Trader/Trader.h" +#include "orbsvcs/Trader/Offer_Database.h" #include "ace/Containers.h" #include "ace/Lock_Adapter_T.h" @@ -267,7 +267,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Trader_T.cpp" +#include "orbsvcs/Trader/Trader_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp index 4d34131c215..abbfed25134 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Trader_Utils.h" +#include "orbsvcs/Trader/Trader_Utils.h" #include "ace/OS_NS_string.h" ACE_RCSID(Trader, Trader_Utils, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index 90e4bf04624..a79c30f8136 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "Trader.h" +#include "orbsvcs/Trader/Trader.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index ebcf26e8e7c..58d3432d24b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -14,7 +14,7 @@ //=========================================================================== -#include "Trading_Loader.h" +#include "orbsvcs/Trader/Trading_Loader.h" #include "tao/ORB_Core.h" #include "tao/default_ports.h" |