diff options
author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-02-04 20:20:27 +0000 |
---|---|---|
committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-02-04 20:20:27 +0000 |
commit | 5a326f47963cc1ef9f2a0d8a0f3bcb94d9b80b89 (patch) | |
tree | c76428cd75cef4d8a412be96af1accf5cdab557f /TAO/orbsvcs/tests | |
parent | 4755552109abd912dbf3ed4ccc6d134500b4f0cb (diff) | |
download | ATCD-5a326f47963cc1ef9f2a0d8a0f3bcb94d9b80b89.tar.gz |
ChangeLogTag: Wed Feb 4 14:18:04 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO/orbsvcs/tests')
250 files changed, 779 insertions, 667 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h index f27b97eef2f..3c67f88ee21 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h @@ -18,9 +18,9 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" #include "tao/PortableServer/PortableServer.h" class Endpoint_Addresses diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp index de4512bf7da..ec98f79d6bd 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp @@ -2,7 +2,7 @@ #include "distributer.h" #include "ace/Get_Opt.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" typedef ACE_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER; diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h index 319f6287193..a2218860dff 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h @@ -19,9 +19,9 @@ // ============================================================================ #include "Connection_Manager.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Distributer_Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h index 8d9638f4d2e..8c32988eae7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h @@ -19,9 +19,9 @@ // ============================================================================ #include "Connection_Manager.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h index b4392ed9a4c..371cf9087fd 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h @@ -19,9 +19,9 @@ // ============================================================================ #include "Connection_Manager.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint { diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h index 9d9316756e3..fdf5eca12f6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h @@ -18,11 +18,11 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h index af864915393..38c4f0fc664 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Sender_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h index 1908c9fc033..666894ccecf 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h @@ -21,9 +21,9 @@ #ifndef CONNECTION_MANAGER_H #define CONNECTION_MANAGER_H -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" #include "tao/PortableServer/PortableServer.h" class Connection_Manager diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index 7c6383e799c..4dbf363f16d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -3,8 +3,8 @@ #include "distributer.h" #include "tao/debug.h" #include "ace/Get_Opt.h" -#include "orbsvcs/AV/Protocol_Factory.h" -#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h" #include "tao/Strategies/advanced_resource.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h index ab6f4753a14..fc9205c72c2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h @@ -19,9 +19,9 @@ // ============================================================================ #include "Connection_Manager.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Signal_Handler : public ACE_Event_Handler { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h index 19a9c673b8c..1870574ee10 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h @@ -19,9 +19,9 @@ // ============================================================================ #include "Connection_Manager.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Signal_Handler : public ACE_Event_Handler { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h index 6b5e8ef9e76..5d9d4971e62 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h @@ -19,9 +19,9 @@ // ============================================================================ #include "Connection_Manager.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Signal_Handler : public ACE_Event_Handler { diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h index 132c98f1af8..b780e067d95 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h @@ -6,12 +6,12 @@ #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Flows_T.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Transport.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Flows_T.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Transport.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" class Client; diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h index 8ce2dc595c5..58bbe6da8a7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h @@ -3,14 +3,14 @@ #include "ace/Get_Opt.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Flows_T.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Transport.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Flows_T.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Transport.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Server; diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp index f02e89b5532..f995c2764d0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp @@ -1,14 +1,16 @@ // $Id$ -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h" #include "tao/PortableServer/PortableServer.h" #include "tao/Strategies/advanced_resource.h" #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/INET_Addr.h" -ACE_RCSID(Latency, ping, "$Id$") +ACE_RCSID (Latency, + ping, + "$Id$") const char *ping_ior = CORBA::string_dup ("file://ping.ior"); const char *pong_ior = CORBA::string_dup ("file://pong.ior"); diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp index f1625d58f14..07801f4a170 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp @@ -1,14 +1,16 @@ // $Id$ #include "ping.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" #include "tao/ORB.h" #include "tao/Strategies/advanced_resource.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" -ACE_RCSID(Latency, ping, "$Id$") +ACE_RCSID (Latency, + ping, + "$Id$") const char *ior_output_file = "ping.ior"; const char *protocol = "RTP/UDP"; diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h index 88e6fc31b97..0567cc3f821 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h @@ -16,9 +16,9 @@ #ifndef TAO_PING_H #define TAO_PING_H -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Policy.h" -#include "orbsvcs/AV/Flows_T.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/Flows_T.h" #include "ace/OS_NS_time.h" class Ping_Recv_Callback : public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index 6fe53fe2f92..6153f46b0e6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp @@ -1,7 +1,7 @@ // $Id$ #include "pong.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" #include "tao/PortableServer/PortableServer.h" #include "tao/Strategies/advanced_resource.h" #include "tao/ORB.h" @@ -10,7 +10,9 @@ #include "ace/High_Res_Timer.h" #include "ace/Stats.h" -ACE_RCSID(Latency, ping, "$Id$") +ACE_RCSID (Latency, + ping, + "$Id$") const char *ior_output_file = "pong.ior"; const char *protocol = "RTP/UDP"; diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h index 92d90adaad4..c8527c9f6f1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h @@ -16,9 +16,9 @@ #ifndef TAO_PONG_H #define TAO_PONG_H -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Policy.h" -#include "orbsvcs/AV/Flows_T.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/Flows_T.h" class Pong_Recv_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h index 9528a063a2a..8af242724c9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h @@ -11,10 +11,10 @@ */ //============================================================================= -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" // = AVStreams calls this class when data shows up from a sender. class Receiver_Callback : public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h index 4a199dd1922..0be17acd796 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h @@ -10,10 +10,10 @@ */ //============================================================================= -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" // = Defines application specific sender stream endpoint. class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h index 7d03bb5726f..eab3bf37497 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h @@ -7,12 +7,12 @@ #include "ace/Get_Opt.h" #include "tao/PortableServer/PortableServer.h" #include "tao/Strategies/advanced_resource.h" -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Transport.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Transport.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" class FTP_Client_Callback :public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h index 9fa52e1620d..6d0b3a697c9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h @@ -4,13 +4,13 @@ #include "ace/Get_Opt.h" #include "tao/Strategies/advanced_resource.h" #include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Transport.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Transport.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class FTP_Server_StreamEndPoint :public TAO_Server_StreamEndPoint diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h index 408ca2e5d09..18ff8ec8671 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h @@ -6,12 +6,12 @@ #include "ace/Get_Opt.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Flows_T.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Flows_T.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" class FTP_Client_Callback; class FTP_Client_Producer diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h index 87a4c22639b..ac21c891ced 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h @@ -2,13 +2,13 @@ // $Id$ #include "ace/Get_Opt.h" -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Flows_T.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Flows_T.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class FTP_Server_Callback :public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h index 048b89b88be..8bc7686cf71 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h @@ -18,11 +18,11 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h index 62b2086a660..f4f8b4716c2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" typedef ACE_Unbounded_Set<TAO_AV_Protocol_Object*> ProtocolObject_Set; typedef ACE_Unbounded_Set_Iterator<TAO_AV_Protocol_Object*> ProtocolObject_SetItor; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h index cfa78e4de09..772016bf4f8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h @@ -22,11 +22,11 @@ #define TAO_AV_FTP_H #include "ace/Get_Opt.h" -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class FTP_Client_Callback : public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h index 23eb5b60957..146d1e9486c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h @@ -16,10 +16,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class FTP_Server_Callback : public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp index 4faa8c72ae8..2fcda3f1f64 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp @@ -1,5 +1,5 @@ #include "TimeStamp.h" -#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" #include "ace/High_Res_Timer.h" // $Id$ diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h index c19b488104f..e860731f0ad 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h @@ -2,7 +2,7 @@ #define TIMESTAMP_H #include /**/ "ace/pre.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" #include "ace/Dynamic_Service.h" #include "export.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h index 70a4c428c40..2ab749b7c70 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h index 8a41bdeb0da..3324e95747f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp index 2ad409534ab..66dc44f0ef8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp @@ -2,7 +2,7 @@ #include "distributer.h" #include "ace/Get_Opt.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" typedef ACE_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h index 0f56e2e2e85..6baa0c53584 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Distributer_Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h index 55d31695179..73d30316424 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h index 29837f9dca7..5fbcc6818ec 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h index 0ef6bc0defd..58d7eea5b2a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Receiver_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h index 64ceca0cc3b..2ae3cac1248 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h index 067c1c7f45b..45f88b35c04 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class Receiver_Callback : public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h index 461c84750d3..6d92b5776d2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h @@ -18,10 +18,10 @@ // // ============================================================================ -#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint { diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp index 039612ba778..abf409ea9c8 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp @@ -2,12 +2,12 @@ // $Id$ // -#include <tao/corba.h> -#include "IFR_Client/IFR_BasicC.h" +#include "tao/NVList.h" +#include "tao/IFR_Client/IFR_BasicC.h" #include "ace/OS_NS_string.h" -int main( int argc, char* argv[] ) -{ +int main (int argc, char* argv[]) +{ ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY_NEW_ENV { diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.h b/TAO/orbsvcs/tests/Concurrency/CC_client.h index a81df69daa0..5c945b65f10 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.h @@ -24,8 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosConcurrencyControlC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "CC_tests.h" #include "CC_naming_service.h" #include "CC_command.h" diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp index b26b31e4c79..d1f5cc64d3c 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -20,10 +20,12 @@ #include "CC_naming_service.h" #include "ace/ACE.h" #include "ace/Process.h" -#include "orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Concurrency, CC_command, "$Id$") +ACE_RCSID (Concurrency, + CC_command, + "$Id$") CC_Command::~CC_Command(void) { diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h index 735d38d7c21..9992d80c6f7 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h @@ -20,7 +20,7 @@ // // ============================================================================ -#include "orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" #ifndef _CC_COMMAND_H_ #define _CC_COMMAND_H_ diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index 8a67df0eb67..2b161c63d94 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -30,7 +30,7 @@ #include "CC_command.h" #include "ace/ACE.h" -#include "orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" #include "ace/OS_NS_stdio.h" void ace_cc_yyerror (const char* s); diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h index 6c04a55541c..3dfbcff8b44 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h @@ -18,9 +18,9 @@ // // ============================================================================ -#include "orbsvcs/CosConcurrencyControlC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" #ifndef _CC_NAMING_SERVICE_H_ #define _CC_NAMING_SERVICE_H_ diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h index 4c1a643f863..95a4605d582 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h @@ -17,7 +17,7 @@ // // ============================================================================ -#include "orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" #ifndef _CC_TEST_UTILS_H_ #define _CC_TEST_UTILS_H_ diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.h b/TAO/orbsvcs/tests/Concurrency/CC_tests.h index 9f0083fd2ad..7417c23235d 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_tests.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.h @@ -18,8 +18,8 @@ // // ============================================================================ -#include "orbsvcs/CosConcurrencyControlC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "CC_naming_service.h" #ifndef _CC_TESTS_H_ diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp index 14bff5925b2..7b6b3cb0345 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp @@ -3,11 +3,13 @@ #include "Counting_Supplier.h" #include "Counting_Consumer.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" -ACE_RCSID(CEC_Tests, Disconnect, "$Id$") +ACE_RCSID (CEC_Tests, + Disconnect, + "$Id$") static void run_test (PortableServer::POA_ptr poa, int use_callbacks diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp index 5587b6584fd..a31c7a75652 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp @@ -4,10 +4,12 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" -ACE_RCSID(CEC_Tests, MT_Disconnect, "$Id$") +ACE_RCSID (CEC_Tests, + MT_Disconnect, + "$Id$") static void run_test (PortableServer::POA_ptr poa, int use_callbacks diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h index 06a263e9178..a6e077c91cc 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h @@ -18,7 +18,7 @@ #define CEC_MT_DISCONNECT_H #include "ace/Task.h" -#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp index 9f117d025b3..c2a6af2ac0c 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp @@ -2,10 +2,12 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" -ACE_RCSID(CEC_Tests_Basic, Pull_Push_Event, "$Id$") +ACE_RCSID (CEC_Tests_Basic, + Pull_Push_Event, + "$Id$") int main (int argc, char* argv[]) diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp index f4fffebd1ad..48bc4698622 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp @@ -2,10 +2,12 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" -ACE_RCSID(CEC_Tests_Basic, Push_Event, "$Id$") +ACE_RCSID (CEC_Tests_Basic, + Push_Event, + "$Id$") int main (int argc, char* argv[]) diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index 7d9019d5bba..e63f132d34e 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -1,12 +1,14 @@ // $Id$ #include "Random.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Arg_Shifter.h" #include "ace/OS_NS_strings.h" -ACE_RCSID(CEC_Tests, Random, "$Id$") +ACE_RCSID (CEC_Tests, + Random, + "$Id$") int main (int argc, char* argv[]) diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h index 450fe418668..d40b29ab84a 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h @@ -17,8 +17,8 @@ #ifndef EC_RANDOM_H #define EC_RANDOM_H -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "ace/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp index b69af879380..2a63a37184c 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp @@ -2,10 +2,12 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" -ACE_RCSID(CEC_Tests_Basic, Shutdown, "$Id$") +ACE_RCSID( CEC_Tests_Basic, + Shutdown, + "$Id$") static void run_test (PortableServer::POA_ptr poa, int with_callbacks diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h index d3ec2cbbb33..fbcc070662d 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h @@ -23,8 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" #include "ace/Task.h" class CEC_Test_Export CEC_Counting_Consumer : public POA_CosEventComm::PushConsumer diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h index 5f557db27ee..c33b963a13e 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h @@ -23,8 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosEventCommS.h" -#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" #include "ace/Task.h" class CEC_Test_Export CEC_Counting_Supplier : public POA_CosEventComm::PushSupplier diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index 5dff1412a09..7dc5636bc8e 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -3,10 +3,10 @@ #include "ECM_Consumer.h" #include "ECM_Data.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "tao/Timeprobe.h" #include "tao/ORB_Core.h" @@ -16,7 +16,9 @@ #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" -ACE_RCSID(EC_Custom_Marshal, ECM_Consumer, "$Id$") +ACE_RCSID (EC_Custom_Marshal, + ECM_Consumer, + "$Id$") int main (int argc, char *argv []) diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h index 1d0adde39fd..5b266e18c7b 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h @@ -17,8 +17,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/OS_NS_time.h" class Driver; diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 8bf2e961486..8c75e9e584c 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -6,10 +6,10 @@ #include "ace/ACE.h" #include "tao/Timeprobe.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ECM_Supplier.h" #include "ECM_Data.h" #include "ace/OS_NS_errno.h" diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h index 10b3adb9270..1aa98e8bea8 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h @@ -17,7 +17,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" class ECMS_Driver; diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h index 232f63a5071..d0be5f4851c 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h @@ -5,7 +5,7 @@ #define ADDRSERVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" class AddrServer : public POA_RtecUDPAdmin::AddrServer { diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp index 23e8b6b0e2a..b43c33fd181 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp @@ -2,8 +2,8 @@ // Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast #include "Consumer.h" -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" ACE_RCSID(EC_MT_Mcast, Consumer, diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h index 1e1d9fdaa17..415b4b19eea 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h @@ -4,8 +4,8 @@ #ifndef CONSUMER_H #define CONSUMER_H -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp index 9db402234b0..70c0d65a892 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp @@ -4,13 +4,13 @@ #include "Consumer.h" #include "Supplier.h" #include "AddrServer.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/ECG_Mcast_EH.h" -#include "orbsvcs/Event/ECG_UDP_Sender.h" -#include "orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp index 851d74512e0..38ee3a1f8f5 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp @@ -2,8 +2,8 @@ // Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast #include "Supplier.h" -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" ACE_RCSID(EC_MT_Mcast, Supplier, diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h index 8f9f50f2a87..b2618c5d810 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h @@ -4,8 +4,8 @@ #ifndef SUPPLIER_H #define SUPPLIER_H -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 32c71519685..f7524e538ac 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -2,12 +2,12 @@ #include "EC_Mcast.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" #include "tao/ORB_Core.h" @@ -21,7 +21,9 @@ #include "EC_Mcast.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(EC_Mcast, EC_Mcast, "$Id$") +ACE_RCSID (EC_Mcast, + EC_Mcast, + "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_PushConsumer_Adapter<ECM_Supplier>; diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h index a1044cb15aa..c7e4d93e777 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h @@ -53,15 +53,15 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/High_Res_Timer.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/Event/ECG_UDP_Sender.h" -#include "orbsvcs/Event/EC_UDP_Admin.h" -#include "orbsvcs/Event/ECG_Mcast_EH.h" -#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h" -#include "orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/Event/ECG_UDP_Sender.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h" +#include "orbsvcs/orbsvcs/Event/EC_UDP_Admin.h" +#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h" class ECM_Driver; diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index ad32b062a54..1f2e5c7c3a4 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -6,14 +6,14 @@ #include "Scheduler_Runtime2.h" #include "Scheduler_Runtime_Dynamic.h" /* infos_3 */ -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/Runtime_Scheduler.h" -#include "orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/orbsvcs/Runtime_Scheduler.h" +#include "orbsvcs/orbsvcs/Event/Event_Channel.h" #include "tao/ORB_Core.h" @@ -27,7 +27,9 @@ # include <sys/lwp.h> /* for _lwp_self */ #endif /* sun */ -ACE_RCSID(EC_Multiple, EC_Multiple, "$Id$") +ACE_RCSID (EC_Multiple, + EC_Multiple, + "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Auto_Basic_Ptr<POA_RtecScheduler::Scheduler>; diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h index 4bf7784e0cd..e3491190859 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h @@ -23,11 +23,11 @@ #include "ace/High_Res_Timer.h" #include "ace/Condition_Thread_Mutex.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/Event/EC_Gateway_Sched.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" class Test_ECG; diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h index a6de5dd6f1d..d5e25a0cafa 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h +++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h @@ -2,7 +2,7 @@ // before editing the file please consider generating it again // $Id$ -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_1[] = { { "Reactor_Task-25000.us", 1, 0, 0, 0, 250000, diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h index 44b87de3f80..3e89bc2e87b 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h +++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h @@ -2,7 +2,7 @@ // before editing the file please consider generating it again // $Id$ -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_2[] = { { "Reactor_Task-25000.us", 1, 0, 0, 0, 250000, diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h index 86089e80ff4..44a0458b555 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h +++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h @@ -2,7 +2,7 @@ // before editing the file please consider generating it again // $Id$ -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_3[] = { { "Reactor_Task-25000.us", 1, 0, 0, 0, 250000, (RtecScheduler::Criticality_t) 4, (RtecScheduler::Importance_t) 0, 0, 1, 59, 1022, 0, (RtecScheduler::Info_Type_t) 0 , (RtecScheduler::RT_Info_Enabled_Type_t) RtecScheduler::RT_INFO_ENABLED }, diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp index 171604e78f2..548da9e2e8b 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp @@ -2,9 +2,9 @@ #include "ECT_Consumer.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/Timeprobe.h" #include "tao/debug.h" @@ -13,7 +13,9 @@ #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" -ACE_RCSID(EC_Throughput, ECT_Consumer, "$Id$") +ACE_RCSID (EC_Throughput, + ECT_Consumer, + "$Id$") Test_Consumer::Test_Consumer (ECT_Driver *driver, void *cookie, diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h index 6a086b38087..e5c69dd1ad5 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h @@ -19,9 +19,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Task.h" #include "ace/OS_NS_time.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index 6de28a3c6d7..366639f8332 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -2,10 +2,10 @@ #include "ECT_Consumer_Driver.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/Timeprobe.h" #include "tao/debug.h" @@ -16,7 +16,9 @@ #include "ace/OS_NS_errno.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(EC_Throughput, ECT_Consumer_Driver, "$Id$") +ACE_RCSID (EC_Throughput, + ECT_Consumer_Driver, + "$Id$") int main (int argc, char *argv []) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h index 4af70e0f7a8..ba33ea4adef 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h @@ -20,8 +20,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ECT_Consumer.h" -#include "orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Task.h" #include "ace/High_Res_Timer.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp index 7fe13479187..06d0710174d 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp @@ -2,9 +2,9 @@ #include "ECT_Supplier.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/Timeprobe.h" #include "tao/debug.h" @@ -15,7 +15,9 @@ #include "ace/High_Res_Timer.h" #include "ace/ACE.h" -ACE_RCSID(EC_Throughput, ECT_Supplier, "$Id$") +ACE_RCSID (EC_Throughput, + ECT_Supplier, + "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_PushSupplier_Adapter<Test_Supplier>; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h index 17fbcb8ce02..ee5dcf255d2 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h @@ -18,9 +18,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "ace/Task.h" class Test_Supplier : public ACE_Task<ACE_SYNCH> diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index 0bb6d9422af..082b1bfa826 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -2,10 +2,10 @@ #include "ECT_Supplier_Driver.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/Timeprobe.h" #include "tao/debug.h" @@ -16,7 +16,9 @@ #include "ace/OS_NS_errno.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(EC_Throughput, ECT_Supplier_Driver, "$Id$") +ACE_RCSID (EC_Throughput, + ECT_Supplier_Driver, + "$Id$") int main (int argc, char *argv []) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h index e51f0f73551..e295690f6e5 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h @@ -19,7 +19,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/High_Res_Timer.h" -#include "orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/orbsvcs/Channel_Clients_T.h" #include "ECT_Driver.h" #include "ECT_Supplier.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index fd2ffe3273b..21fe2ee77e3 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -2,16 +2,16 @@ #include "ECT_Throughput.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/Runtime_Scheduler.h" -#include "orbsvcs/Event/Event_Channel.h" -#include "orbsvcs/Event/Module_Factory.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/orbsvcs/Runtime_Scheduler.h" +#include "orbsvcs/orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" #include "tao/Timeprobe.h" #include "tao/debug.h" @@ -23,7 +23,9 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_errno.h" -ACE_RCSID(EC_Throughput, ECT_Throughput, "$Id$") +ACE_RCSID (EC_Throughput, + ECT_Throughput, + "$Id$") int main (int argc, char *argv []) diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index 5130896ad70..2829947df81 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -3,12 +3,14 @@ #include "Atomic_Reconnect.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" - -ACE_RCSID(EC_Tests, Atomic_Reconnect, "$Id$") +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" + +ACE_RCSID (EC_Tests, + Atomic_Reconnect, + "$Id$") const int event_type = 20; const int event_source = 10; diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h index 6aafd6e9dce..93b84af5c2d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h @@ -14,7 +14,7 @@ #define EC_ATOMIC_RECONNECT_H #include "Counting_Consumer.h" -#include "orbsvcs/Channel_Clients.h" +#include "orbsvcs/orbsvcs/Channel_Clients.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index 5ab0bd4a842..4e085a1df56 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -3,12 +3,14 @@ #include "BCast.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/Event/ECG_Mcast_Gateway.h" +#include "orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h" #include "tao/ORB_Core.h" #include "ace/Arg_Shifter.h" #include "ace/INET_Addr.h" -ACE_RCSID(EC_Tests_Basic, BCast, "$Id$") +ACE_RCSID (EC_Tests_Basic, + BCast, + "$Id$") int main (int argc, char *argv []) diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h index 8cbcfa4c368..5ec95b193a8 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.h +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h @@ -14,7 +14,7 @@ #define EC_BCAST_H #include "Driver.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" class ACE_INET_Addr; diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp index c34c27eea06..2e9c750ccf5 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp @@ -3,12 +3,14 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" - -ACE_RCSID(EC_Tests, Bitmask, "$Id$") +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" + +ACE_RCSID (EC_Tests, + Bitmask, + "$Id$") int main (int argc, char* argv[]) diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp index 05ed9b5f448..5beec0820a2 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp @@ -2,12 +2,14 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" - -ACE_RCSID(EC_Tests, Complex, "$Id$") +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" + +ACE_RCSID (EC_Tests, + Complex, + "$Id$") int main (int argc, char* argv[]) diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index dd6efb09e13..0ccb01763af 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -3,12 +3,14 @@ #include "Control.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" - -ACE_RCSID(EC_Tests, Control, "$Id$") +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" + +ACE_RCSID (EC_Tests, + Control, + "$Id$") const int event_type = 20; const int event_source = 10; diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h index 2df1cb7e3ea..ac641891b4b 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.h +++ b/TAO/orbsvcs/tests/Event/Basic/Control.h @@ -14,7 +14,7 @@ #define EC_CONTROL_H #include "Counting_Consumer.h" -#include "orbsvcs/Channel_Clients.h" +#include "orbsvcs/orbsvcs/Channel_Clients.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp index 124ffcb5e2e..425e6b97eca 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp @@ -3,12 +3,14 @@ #include "Counting_Supplier.h" #include "Counting_Consumer.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" - -ACE_RCSID(EC_Tests, Disconnect, "$Id$") +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" + +ACE_RCSID (EC_Tests, + Disconnect, + "$Id$") static void run_test (PortableServer::POA_ptr poa, int use_callbacks diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp index 25823fbe628..d908603bb20 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp @@ -2,13 +2,15 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/EC_Gateway_IIOP.h" - -ACE_RCSID(EC_Tests, Gateway, "$Id$") +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h" + +ACE_RCSID (EC_Tests, + Gateway, + "$Id$") int main (int argc, char* argv[]) diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp index 28b60cf41bf..f2349ee5a21 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -4,12 +4,14 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" - -ACE_RCSID(EC_Tests, MT_Disconnect, "$Id$") +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" + +ACE_RCSID (EC_Tests, + MT_Disconnect, + "$Id$") static void run_test (PortableServer::POA_ptr poa, int use_callbacks diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h index 06855260d66..03e058934e1 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h @@ -14,7 +14,7 @@ #define EC_MT_DISCONNECT_H #include "ace/Task.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp index e94876eff99..44a50a10b13 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp @@ -3,12 +3,14 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" - -ACE_RCSID(EC_Tests, Negation, "$Id$") +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" + +ACE_RCSID (EC_Tests, + Negation, + "$Id$") int main (int argc, char* argv[]) diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index 8ea3d55d74b..58253b839bd 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -3,12 +3,14 @@ #include "Observer.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" #include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" -ACE_RCSID(EC_Tests_Basic, Observer, "$Id$") +ACE_RCSID (EC_Tests_Basic, + Observer, + "$Id$") int main (int argc, char *argv []) diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h index bb788c01258..13ae141293c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.h +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h @@ -14,7 +14,7 @@ #define EC_OBSERVER_H #include "Driver.h" -#include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index 6217f46081e..44a4f2cb1d2 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -1,14 +1,16 @@ // $Id$ #include "Random.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "ace/Arg_Shifter.h" #include "ace/OS_NS_strings.h" -ACE_RCSID(EC_Tests, Random, "$Id$") +ACE_RCSID (EC_Tests, + Random, + "$Id$") int main (int argc, char* argv[]) diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h index 22fd387192b..727806f0be0 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.h +++ b/TAO/orbsvcs/tests/Event/Basic/Random.h @@ -13,8 +13,8 @@ #ifndef EC_RANDOM_H #define EC_RANDOM_H -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #include "ace/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index 8e80572c29e..ba63f91ba2d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -3,11 +3,13 @@ #include "Reconnect.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" -ACE_RCSID(EC_Tests_Basic, Reconnect, "$Id$") +ACE_RCSID (EC_Tests_Basic, + Reconnect, + "$Id$") int main (int argc, char *argv []) diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp index 682b11a8606..79fbf4580fe 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp @@ -3,12 +3,14 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" - -ACE_RCSID(EC_Tests, Timeout, "$Id$") +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" + +ACE_RCSID (EC_Tests, + Timeout, + "$Id$") // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp index 30690628e96..868ff9b95f2 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp @@ -2,12 +2,14 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" - -ACE_RCSID(EC_Tests, Wildcard, "$Id$") +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" + +ACE_RCSID (EC_Tests, + Wildcard, + "$Id$") int main (int argc, char* argv[]) diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp index 5fe05170a84..33207f3d371 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp @@ -1,7 +1,7 @@ // $Id$ #include "EC_Wrapper.h" -#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "ace/Auto_Ptr.h" EC_Wrapper::EC_Wrapper (void) diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h index a8421c9334e..22b1f7a328e 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h @@ -4,8 +4,8 @@ #ifndef EC_WRAPPER_H #define EC_WRAPPER_H -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h" #include "ECMcastTests_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp index f2d62bc26f2..dfa129ef6c4 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp @@ -1,9 +1,9 @@ // $Id$ #include "Gateway_EC.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/ECG_Mcast_Gateway.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h" +#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h" #include "ace/Get_Opt.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index 2f1ef4de6dc..ffdb42a1858 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Constants.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h" #include "orbsvcs/orbsvcs/Event_Utilities.h" #include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/orbsvcs/RtecEventCommS.h" diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index 087bf7f3831..1860291e40d 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -3,12 +3,14 @@ #include "Connect.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" #include "ace/OS_NS_strings.h" -ACE_RCSID(EC_Tests_Performance, Connect, "$Id$") +ACE_RCSID (EC_Tests_Performance, + Connect, + "$Id$") int main (int argc, char *argv []) diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp index cb09add9977..b1f33edb93b 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -3,12 +3,14 @@ #include "Inversion.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "ace/Sched_Params.h" #include "ace/Arg_Shifter.h" -ACE_RCSID(EC_Tests_Performance, Inversion, "$Id$") +ACE_RCSID (EC_Tests_Performance, + Inversion, + "$Id$") int main (int argc, char *argv []) diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index 23c11650fd9..7d0a54f78c6 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Latency.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "tao/Messaging/Messaging.h" #include "tao/Strategies/advanced_resource.h" diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h index 3b6880e36b5..365e21bcf2c 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.h +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h @@ -17,8 +17,8 @@ #ifndef EC_LATENCY_H #define EC_LATENCY_H -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index 875bbf1803d..0b79f385e8a 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" #include "tao/Messaging/Messaging.h" #include "tao/Strategies/advanced_resource.h" diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index 1ebbb09a649..31ae3910a5d 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -3,10 +3,12 @@ #include "Throughput.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "ace/Get_Opt.h" -ACE_RCSID(EC_Tests_Performance, Throughput, "$Id$") +ACE_RCSID (EC_Tests_Performance, + Throughput, + "$Id$") int main (int argc, char *argv []) diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp index ed9c16e3de3..3be234ab90f 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp @@ -1,12 +1,14 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/debug.h" -ACE_RCSID(EC_Tests, EC_Consumer, "$Id$") +ACE_RCSID (EC_Tests, + EC_Consumer, + "$Id$") EC_Consumer::EC_Consumer (EC_Driver *driver, void *cookie) diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h index 439b95f9747..ce3c6678d39 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/OS_NS_time.h" /** diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h index 06878cb4b9f..482a9afc68e 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" /** * @class EC_Counting_Consumer diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp index 838f3b35e7c..712c6a15215 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp @@ -1,10 +1,12 @@ // $Id$ #include "Counting_Supplier.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(EC_Tests, EC_Count_Supplier, "$Id$") +ACE_RCSID (EC_Tests, + EC_Count_Supplier, + "$Id$") EC_Counting_Supplier::EC_Counting_Supplier (void) : event_count (0), diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h index cc76b3a6e91..da4b7f67172 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Channel_Clients.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Channel_Clients.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Task.h" /** diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index 172264d2acd..22b59188f7f 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -4,10 +4,10 @@ #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h index c902b4a7052..b6165e14ab4 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.h +++ b/TAO/orbsvcs/tests/Event/lib/Driver.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #include "ace/Stats.h" #include "ace/Task.h" diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index 8424216bd5c..97a49df7d5d 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -1,13 +1,15 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "tao/debug.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(EC_Tests, EC_Supplier, "$Id$") +ACE_RCSID (EC_Tests, + EC_Supplier, + "$Id$") EC_Supplier::EC_Supplier (EC_Driver *driver, void* cookie) diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h index 065a20a15aa..9f4b5820fb1 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Task.h" #include "ace/OS_NS_time.h" diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp index af2524a1fe1..9f5c9a92aac 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp @@ -13,7 +13,7 @@ //============================================================================= #include <tao/Utils/Server_Main.h> -#include <orbsvcs/PortableGroup/PG_FactoryRegistry.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h> int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index 8ca927d77a0..193ef991fb8 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -15,7 +15,7 @@ #include "FT_Creator.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" -#include <orbsvcs/PortableGroup/PG_Properties_Encoder.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h> #include <ace/Get_Opt.h> #include <ace/OS_NS_stdio.h> diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index 45b1e7753fb..c608a890b89 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -13,10 +13,10 @@ #include "FT_ReplicaFactory_i.h" #include "FT_TestReplica_i.h" #include <ace/Get_Opt.h> -#include <orbsvcs/CosNamingC.h> -#include <orbsvcs/PortableGroupC.h> +#include <orbsvcs/orbsvcs/CosNamingC.h> +#include <orbsvcs/orbsvcs/PortableGroupC.h> #include <tao/PortableServer/ORB_Manager.h> -#include <orbsvcs/PortableGroup/PG_Property_Set.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h> // Use this macro at the beginning of CORBA methods // to aid in debugging. diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h index a2bc85e5f80..0db1f6d948c 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h @@ -30,7 +30,7 @@ class FT_ReplicaFactory_i; #include <ace/Vector_T.h> #include "FT_TestReplicaS.h" #include <ace/Thread_Manager.h> -#include <orbsvcs/FT_ReplicationManagerC.h> +#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h> ///////////////////// // Forward references diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp index 128f6e86531..b79e5fe3ce0 100755 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/FT_ReplicationManagerC.h" +#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h" #include <ace/Get_Opt.h> // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl b/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl index b9d41ed7429..7df01cb3cfc 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl @@ -14,7 +14,7 @@ #ifndef FT_TESTREPLICA_IDL #define FT_TESTREPLICA_IDL -#include "orbsvcs/FT_Replica.idl" +#include "orbsvcs/orbsvcs/FT_Replica.idl" module FT_TEST { diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h index 0d0833f7755..b06a41469cb 100755 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h @@ -10,8 +10,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include <orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h> -#include <orbsvcs/FT_NotifierC.h> -#include <orbsvcs/FT_FaultDetectorFactoryC.h> +#include <orbsvcs/orbsvcs/FT_NotifierC.h> +#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h> #include <ace/Vector_T.h> ///////////////////// diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h index d81d9fa061c..d7183f6c7f0 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h @@ -10,8 +10,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include <orbsvcs/CosNotifyChannelAdminS.h> -#include <orbsvcs/FT_NotifierC.h> +#include <orbsvcs/orbsvcs/CosNotifyChannelAdminS.h> +#include <orbsvcs/orbsvcs/FT_NotifierC.h> ////////////////////// // Forward references diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index c71354f88d0..f0cd42c8c18 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp @@ -5,7 +5,7 @@ #include "StubFaultAnalyzer.h" #include <ace/Get_Opt.h> #include <tao/PortableServer/ORB_Manager.h> -#include <orbsvcs/PortableGroup/PG_Properties_Encoder.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h> // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h index 7da34e52cba..d617e9c4845 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h @@ -12,8 +12,8 @@ #include "StubFaultConsumer.h" #include "StubBatchConsumer.h" -#include <orbsvcs/FT_NotifierC.h> -#include <orbsvcs/FT_FaultDetectorFactoryC.h> +#include <orbsvcs/orbsvcs/FT_NotifierC.h> +#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h> #include "ace/Vector_T.h" diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h index 374b2e7b588..630bad0d6e9 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h @@ -10,8 +10,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include <orbsvcs/FT_NotifierC.h> +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include <orbsvcs/orbsvcs/FT_NotifierC.h> ////////////////////// // Forward references diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h index b939dbdf74b..32e738a8b92 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h @@ -11,8 +11,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ <ace/pre.h> -#include <orbsvcs/FT_NotifierS.h> -#include <orbsvcs/FT_FaultDetectorFactoryC.h> +#include <orbsvcs/orbsvcs/FT_NotifierS.h> +#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h> #include <ace/Vector_T.h> ////////////////////// diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp index 64dfe677f67..c8326896681 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp @@ -14,9 +14,9 @@ #include "TAO_Object_Group_Creator.h" #include <ace/OS_NS_stdio.h> -#include <orbsvcs/PortableGroup/PG_Properties_Encoder.h> -#include <orbsvcs/FT_FaultDetectorFactoryC.h> -#include <orbsvcs/PortableGroup/PG_Operators.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h> +#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Operators.h> #include <ace/Get_Opt.h> diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h index 5bf6c6aae58..f987d0b45ac 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h @@ -20,8 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include <orbsvcs/FT_ReplicationManagerC.h> -#include <orbsvcs/PortableGroupC.h> +#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h> +#include <orbsvcs/orbsvcs/PortableGroupC.h> #include <ace/SString.h> #include <ace/Vector_T.h> diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp index c03178bd0f0..b97637c874d 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- #include "Server_Request_Interceptor.h" -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" #include "tao/ORB_Constants.h" #include "testS.h" diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp index 82ac5cdec4b..800f6eacbfa 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp @@ -2,7 +2,7 @@ #include "ace/Get_Opt.h" #include "testC.h" -#include "orbsvcs/FaultTolerance/FT_Service_Activate.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h" ACE_RCSID (Group_Ref_Manip, client, diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index ee1bd7e9d0e..5d959174ed5 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp @@ -10,9 +10,9 @@ #include "Server_Request_Interceptor.h" #include "tao/IORManipulation/IORManipulation.h" #include "tao/ORBInitializer_Registry.h" -#include "orbsvcs/FaultTolerance/FT_Service_Activate.h" -#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" -#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" ACE_RCSID (ForwardRequest, server, diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index e876e51290b..7d1740af1fb 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -6,12 +6,10 @@ #include "ace/Read_Buffer.h" #include "tao/IORManipulation/IORManip_Loader.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/FaultTolerance/FT_Service_Activate.h" -#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "ace/OS_NS_stdio.h" - - // Files which have the IOR const char *first_ior = 0; const char *second_ior = 0; diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp index c0120577eab..9d85a48410e 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp @@ -18,15 +18,13 @@ //========================================================================= #include "tao/ORB.h" -#include "orbsvcs/FT_CORBA_ORBC.h" -#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" - +#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" ACE_RCSID(IOGRManipluation, IOGRTest, "$Id$") - int main (int argc, char *argv[]) { diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp index 89534672eff..a796bb9dbac 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_sys_time.h" #include "PushConsumer.h" -#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h" #include <stdio.h> ACE_RCSID (FtRtEvent, diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h index b7daa9f35bd..6fdd67d1209 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h @@ -12,7 +12,7 @@ #ifndef PUSHCONSUMERIMPL_H #define PUSHCONSUMERIMPL_H -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" class PushConsumer_impl : public virtual POA_RtecEventComm::PushConsumer diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp index 66d1da17a73..15ec5acd157 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -1,19 +1,18 @@ // $Id$ -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "PushSupplier.h" #include "ace/Reactor.h" #include "ace/Select_Reactor.h" #include "tao/MProfile.h" #include "tao/Stub.h" -#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h" ACE_RCSID (FtRtEvent, PushSupplier, "$Id$") - int PushSupplier_impl::ReactorTask::svc (void) { diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h index 350a7d96708..e84f0b28e9c 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h @@ -12,8 +12,8 @@ #ifndef PUSHSUPPLIER_H #define PUSHSUPPLIER_H -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include "ace/Event_Handler.h" #include "ace/Task.h" #include "ace/Reactor.h" diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp index 8fabe5d60d4..52afdd7fddb 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp @@ -1,18 +1,18 @@ // $Id$ -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "PushConsumer.h" #include "ace/Get_Opt.h" -#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" -#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" /// include this file to statically linked with FT ORB -#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h" /// include this file to statically linked with Transaction Depth -#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" +#include "orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" ACE_RCSID (FtRtEvent, PushConsumer, diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp index a920d5d6910..d2383d84e9c 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp @@ -1,22 +1,21 @@ // $Id$ -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" #include "PushSupplier.h" #include "ace/Get_Opt.h" -#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" -#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" /// include this file to statically linked with FT ORB -#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h" /// include this file to statically linked with Transaction Depth -#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" +#include "orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" ACE_RCSID (FtRtEvent, supplier, "$Id$") - ACE_Time_Value timer_interval(1,0); CORBA::ORB_var orb; auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway; diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp index b885f1b28ed..defc5e21897 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp @@ -2,7 +2,7 @@ // $Id$ // -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Log_Msg.h" diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc index 2b7c7a7429f..a34e2eafcf1 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc @@ -4,6 +4,11 @@ project: taoexe, ifr_client { avoids += minimum_corba exename = IDL3_Test + + Source_Files { + client.cpp + idl3_client.cpp + } IDL_Files { } diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index 5180073acf4..eab444a49cd 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -1,6 +1,6 @@ #include "Basic_Log_Test.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h index 031c19ba769..e60b1ecddc5 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h @@ -17,8 +17,8 @@ #ifndef TAO_BASIC_LOG_TEST_H #define TAO_BASIC_LOG_TEST_H -#include "orbsvcs/DsLogAdminC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/DsLogAdminC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" class BasicLog_Test { diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp index 10eb9383368..6d96f438923 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp @@ -3,11 +3,13 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" #include "tao/debug.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "IdAssignment.h" -ACE_RCSID (Notify_Tests, IdAssignment, "$Id$") +ACE_RCSID (Notify_Tests, + IdAssignment, + "$Id$") IdAssignment::IdAssignment (void) : iter_ (3), diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h index 7b4a7e3920f..581fa2be9b5 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h @@ -16,7 +16,7 @@ #ifndef IDASSIGNMENT_H #define IDASSIGNMENT_H -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" class IdAssignment { diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp index 34d526bf3d9..bf7a29af1e4 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp @@ -3,13 +3,15 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" #include "tao/debug.h" -#include <orbsvcs/CosNamingC.h> -#include <orbsvcs/CosNotifyCommC.h> -#include <orbsvcs/CosNotifyChannelAdminC.h> +#include <orbsvcs/orbsvcs/CosNamingC.h> +#include <orbsvcs/orbsvcs/CosNotifyCommC.h> +#include <orbsvcs/orbsvcs/CosNotifyChannelAdminC.h> #include "LifeCycle.h" -ACE_RCSID (Notify_Tests, LifeCycle, "$Id$") +ACE_RCSID (Notify_Tests, + LifeCycle, + "$Id$") LifeCycle::LifeCycle (void) : count_ (10) diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h index 19352ec0150..fd234dcc6e5 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h @@ -19,7 +19,7 @@ #include "Notify_Test_Client.h" #include "Notify_SequencePushConsumer.h" #include "Notify_SequencePushSupplier.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp index c1fb14ec678..84254cda87b 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Notify_Structured_Push_Consumer.h" -#include "orbsvcs/Notify/Notify_Extensions.h" +#include "orbsvcs/orbsvcs/Notify/Notify_Extensions.h" #include "common.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h index 8041f156b35..86b160c2e0a 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h @@ -19,7 +19,7 @@ #define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H #include "Notify_StructuredPushConsumer.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" class Notify_Structured_Push_Consumer: public TAO_Notify_Tests_StructuredPushConsumer { diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp index 3992a28f441..6216ea6a384 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp @@ -6,9 +6,9 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Notify_Structured_Push_Consumer.h" #include "goC.h" diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp index 03c7ce9214a..d1220a50e02 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp @@ -8,10 +8,10 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Notify_StructuredPushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp index c88d7dc082d..be72b75214f 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp @@ -2,8 +2,8 @@ #include "common.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.h b/TAO/orbsvcs/tests/Notify/Blocking/common.h index 0e37aa80491..aaa7826b07f 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/common.h +++ b/TAO/orbsvcs/tests/Notify/Blocking/common.h @@ -18,7 +18,7 @@ #ifndef TAO_COMMON_H #define TAO_COMMON_H -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" const char* Any_String (const CORBA::Any& any); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp index 85f6bd704d4..ab0fe8d5e43 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Notify_Sequence_Push_Consumer.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp index e90987df064..8fbad2de53b 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp @@ -6,8 +6,8 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Sequence_Push_Consumer.h" #include "goC.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp index 427fc996aea..79cf4ff3634 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp @@ -8,10 +8,10 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Notify_SequencePushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp index f7d72462486..b997fb9f27a 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp @@ -6,8 +6,8 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Structured_Push_Consumer.h" #include "goC.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp index 47302392e00..050a2976d53 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp @@ -8,10 +8,10 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Notify_StructuredPushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp index c88d7dc082d..be72b75214f 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp @@ -2,8 +2,8 @@ #include "common.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.h b/TAO/orbsvcs/tests/Notify/Discarding/common.h index 0e37aa80491..aaa7826b07f 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/common.h +++ b/TAO/orbsvcs/tests/Notify/Discarding/common.h @@ -18,7 +18,7 @@ #ifndef TAO_COMMON_H #define TAO_COMMON_H -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" const char* Any_String (const CORBA::Any& any); diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp index 1486816ff5e..5e7b8b6f034 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp @@ -6,8 +6,8 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Structured_Push_Consumer.h" #include "goC.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp index f50a5bc3846..80f3d3ad428 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp @@ -8,9 +8,9 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_StructuredPushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp index 3b60cddc583..edbfadbf441 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Notify_Sequence_Push_Consumer.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp index 4a0726e4d0c..b86efc47f25 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Notify_Structured_Push_Consumer.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp index 495f48ce04f..f7be5e1c8a7 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp @@ -6,8 +6,8 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Sequence_Push_Consumer.h" #include "goC.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp index c28781d904d..a6fc0e42e2e 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp @@ -8,10 +8,10 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Notify_SequencePushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp index 2942fc5ed3f..6f778208274 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp @@ -6,8 +6,8 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Structured_Push_Consumer.h" #include "goC.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp index eb2babf33ad..16e894b6c83 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp @@ -8,10 +8,10 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Notify_StructuredPushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp index c88d7dc082d..be72b75214f 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp @@ -2,8 +2,8 @@ #include "common.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.h b/TAO/orbsvcs/tests/Notify/Ordering/common.h index 679adb0a42c..54ce6c9720a 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/common.h +++ b/TAO/orbsvcs/tests/Notify/Ordering/common.h @@ -18,7 +18,7 @@ #ifndef TAO_COMMON_H #define TAO_COMMON_H -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" const char* Any_String (const CORBA::Any& any); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp index 2f1f5c9c41d..b12d9cdfffe 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Notify_Sequence_Push_Consumer.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp index c4357fb4351..c49b5f35669 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp @@ -6,8 +6,8 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Sequence_Push_Consumer.h" #include "goC.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp index 62127227df9..a99fcaa6aec 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp @@ -8,10 +8,10 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "Notify_SequencePushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp index c88d7dc082d..be72b75214f 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp @@ -2,8 +2,8 @@ #include "common.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h index 0e37aa80491..aaa7826b07f 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h @@ -18,7 +18,7 @@ #ifndef TAO_COMMON_H #define TAO_COMMON_H -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" const char* Any_String (const CORBA::Any& any); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp index 292fe4f59aa..58684ce1b19 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Notify_Sequence_Push_Consumer.h" -#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp index 14a39144cdc..f621109f7a8 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp @@ -6,8 +6,8 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Sequence_Push_Consumer.h" #include "goC.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp index a6c6bac9662..6f2a32690c9 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp @@ -11,9 +11,9 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_SequencePushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp index c88d7dc082d..be72b75214f 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp @@ -2,8 +2,8 @@ #include "common.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h index 0e37aa80491..aaa7826b07f 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h @@ -18,7 +18,7 @@ #ifndef TAO_COMMON_H #define TAO_COMMON_H -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" const char* Any_String (const CORBA::Any& any); diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp index 279b8e6448a..f6f3ae6326c 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp @@ -6,9 +6,9 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "controlC.h" #include "Notify_Push_Consumer.h" #include "Notify_Test_Client.h" diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp index 74a90e7f845..fba45d19f79 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp @@ -4,9 +4,9 @@ // Include Section // ****************************************************************** -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_StructuredPushSupplier.h" #include "controlS.h" #include "Notify_Test_Client.h" diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp index 67cd1747dda..ef1b3372df7 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp @@ -6,9 +6,9 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "controlC.h" #include "Notify_Push_Consumer.h" #include "Notify_Test_Client.h" diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp index 829bc0b9b08..8b4d62ec7b7 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp @@ -5,9 +5,9 @@ // ****************************************************************** #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Push_Supplier.h" #include "controlS.h" #include "Notify_Test_Client.h" diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h index 4b2e1021bdb..0efa9039997 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h index 627fd171ed7..33e6b5a5203 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyFilterS.h" -#include "orbsvcs/Notify/FilterFactory.h" +#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/orbsvcs/Notify/FilterFactory.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h index a94146e47bc..429cfe0ca99 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SString.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" /** diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h index 2c4aeb81e78..1a94c4f4291 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SString.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" #include "../../../orbsvcs/Notify/CosNotify_Initializer.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h index 2678b6c4437..24e263b908c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SString.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" /** diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h index 6cd7f1da60d..bba40b99762 100644 --- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h +++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h @@ -21,8 +21,8 @@ #include "ace/Singleton.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Hash_Map_Manager.h" class TAO_Notify_Tests_Periodic_Supplier; diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h index 60a1e436d08..b85f6540d86 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h @@ -16,9 +16,9 @@ #ifndef NOTIFY_TEST_CLIENT_H #define NOTIFY_TEST_CLIENT_H -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "notify_test_export.h" class TAO_NOTIFY_TEST_Export Notify_Test_Client diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp index 9f167185c62..0a257ceed2d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp @@ -2,10 +2,12 @@ #include "Options_Parser.h" -ACE_RCSID(lib, TAO_Options_Parser, "$Id$") +ACE_RCSID (lib, + TAO_Options_Parser, + "$Id$") #include "tao/debug.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" TAO_Notify_Tests_Options_Parser::TAO_Notify_Tests_Options_Parser (void) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h index 7acd1919324..6cdc20933b0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Arg_Shifter.h" -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" /** * @class TAO_Notify_Tests_Options_Parser diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp index af33e0cb73f..f6e11655d40 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp @@ -6,13 +6,15 @@ #include "Peer.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(lib, TAO_Peer, "$Id$") +ACE_RCSID (lib, + TAO_Peer, + "$Id$") #include "ace/Arg_Shifter.h" #include "Name.h" #include "LookupManager.h" #include "Options_Parser.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" TAO_Notify_Tests_Peer::TAO_Notify_Tests_Peer (void) : poa_name_ (TAO_Notify_Tests_Name::root_poa) diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp index c0e949b6a56..8a042567060 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp @@ -9,13 +9,15 @@ #include "Peer_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_Notify_Tests_Peer_T, "$Id$") +ACE_RCSID (Notify, + TAO_Notify_Tests_Peer_T, + "$Id$") #include "ace/Arg_Shifter.h" #include "Name.h" #include "LookupManager.h" #include "Options_Parser.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" template <class Peer_Traits> TAO_Notify_Tests_Peer_T<Peer_Traits>::TAO_Notify_Tests_Peer_T (void) diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp index 990acbbcf55..116f4d7fedf 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp @@ -5,14 +5,16 @@ #include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" #include "tao/debug.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "StructuredEvent.h" #include "Task_Stats.h" #include "Task_Callback.h" #include "LookupManager.h" #include "Priority_Mapping.h" -ACE_RCSID(RT_Notify, TAO_Notify_Tests_Periodic_Consumer, "$Id$") +ACE_RCSID (RT_Notify, + TAO_Notify_Tests_Periodic_Consumer, + "$Id$") int WARMUP_COUNT = 10; diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp index b856ca38648..78929ec2730 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp @@ -2,7 +2,9 @@ #include "Periodic_Consumer_Command.h" -ACE_RCSID(lib, TAO_Periodic_Consumer_Command, "$Id$") +ACE_RCSID (lib, + TAO_Periodic_Consumer_Command, + "$Id$") #include "LookupManager.h" #include "Name.h" @@ -11,7 +13,7 @@ ACE_RCSID(lib, TAO_Periodic_Consumer_Command, "$Id$") #include "Direct_Consumer.h" #include "Activation_Manager.h" #include "Options_Parser.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" TAO_Notify_Tests_Periodic_Consumer_Command::TAO_Notify_Tests_Periodic_Consumer_Command (void) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h index d258c7e2e8a..977c0f22f64 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SString.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" class TAO_Notify_Tests_Periodic_Consumer; diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp index 3c8ba10a38d..308f3f6e459 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp @@ -7,14 +7,16 @@ #include "ace/Barrier.h" #include "tao/debug.h" #include "tao/ORB_Core.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "StructuredEvent.h" #include "Task_Stats.h" #include "Task_Callback.h" #include "LookupManager.h" #include "Priority_Mapping.h" -ACE_RCSID(RT_Notify, TAO_Notify_Tests_Periodic_Supplier, "$Id$") +ACE_RCSID (RT_Notify, + TAO_Notify_Tests_Periodic_Supplier, + "$Id$") TAO_Notify_Tests_Periodic_Supplier::TAO_Notify_Tests_Periodic_Supplier (void) : barrier_ (0), diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp index c3c06163550..6b97740e3ca 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp @@ -2,7 +2,9 @@ #include "Periodic_Supplier_Command.h" -ACE_RCSID(lib, TAO_Periodic_Supplier_Command, "$Id$") +ACE_RCSID (lib, + TAO_Periodic_Supplier_Command, + "$Id$") #include "LookupManager.h" #include "Name.h" @@ -10,7 +12,7 @@ ACE_RCSID(lib, TAO_Periodic_Supplier_Command, "$Id$") #include "Direct_Supplier.h" #include "Activation_Manager.h" #include "Options_Parser.h" -#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" TAO_Notify_Tests_Periodic_Supplier_Command::TAO_Notify_Tests_Periodic_Supplier_Command (void) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h index 726d7cd0ddd..a03215cb7b4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SString.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" class TAO_Notify_Tests_Periodic_Supplier; diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h index dddecec4dc1..a2a5b236df8 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/orbsvcs/CosNotificationC.h" /** * @class TAO_Notify_Tests_StructuredEvent diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h index fbed3172551..10c011ee66d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SString.h" -#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" /** diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp index 1ff4cb087c0..a0cfc9f8a46 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp @@ -6,8 +6,8 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Sequence_Push_Consumer.h" #include "goC.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp index 124dca8a155..cff6c00dfe3 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp @@ -8,9 +8,9 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_SequencePushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp index 8c543bd6b44..541266d8cd1 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp @@ -6,8 +6,8 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_Structured_Push_Consumer.h" #include "goC.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp index c3cc5ac0f4a..5644e71b127 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp @@ -8,9 +8,9 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "Notify_StructuredPushSupplier.h" #include "goS.h" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp index c88d7dc082d..be72b75214f 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp @@ -2,8 +2,8 @@ #include "common.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h index 0e37aa80491..aaa7826b07f 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h @@ -18,7 +18,7 @@ #ifndef TAO_COMMON_H #define TAO_COMMON_H -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" const char* Any_String (const CORBA::Any& any); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp index 6b9ee00d231..1dcc9f2e98a 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -4,10 +4,12 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "tao/debug.h" -ACE_RCSID(Notify, RedGreen_Test, "$Id$") +ACE_RCSID (Notify, + RedGreen_Test, + "$Id$") #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory" #define NAMING_SERVICE_NAME "NameService" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index a6d83524294..6759d3bc543 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -17,9 +17,9 @@ #ifndef NOTIFY_RedGreen_Test_CLIENT_H #define NOTIFY_RedGreen_Test_CLIENT_H -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/Task.h" #include "ace/Stats.h" #include "ace/High_Res_Timer.h" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 27f51ab9134..a298517a58d 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -9,10 +9,12 @@ #include "ace/Dynamic_Service.h" #include "tao/Strategies/advanced_resource.h" #include "tao/Messaging/Messaging.h" -#include "orbsvcs/Notify/Service.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Notify/Service.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" -ACE_RCSID (Notify_Tests, Throughput, "$Id$") +ACE_RCSID (Notify_Tests, + Throughput, + "$Id$") /***************************************************************************/ diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h index 68ea5861f2e..9ff5ad078b2 100644 --- a/TAO/orbsvcs/tests/Property/client.h +++ b/TAO/orbsvcs/tests/Property/client.h @@ -30,8 +30,8 @@ #include "ace/Thread_Manager.h" #include "ace/Get_Opt.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/Property/CosPropertyService_i.h" -#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" class Client { diff --git a/TAO/orbsvcs/tests/Property/server.h b/TAO/orbsvcs/tests/Property/server.h index b83f28e09dd..afe9808e3bf 100644 --- a/TAO/orbsvcs/tests/Property/server.h +++ b/TAO/orbsvcs/tests/Property/server.h @@ -21,7 +21,7 @@ #define COSPROPERTYSERVICE_SERVER_H #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/Property/CosPropertyService_i.h" -#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" #endif /* COSPROPERTYSERVICE_SERVER_H */ diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp index a75adb276d0..b3ff965ac4d 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp @@ -12,7 +12,7 @@ #include "testSchedC.h" -#include <orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h> +#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h> #include "ace/Get_Opt.h" #include "tao/debug.h" #include "ace/OS_main.h" diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp index 5cf7b94a164..a4b9e309967 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp @@ -11,7 +11,7 @@ //============================================================================= #include "Object1_i.h" -#include <orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h> +#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h> // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 8ae380b8bec..786f53ab34b 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -17,14 +17,16 @@ // ============================================================================ #include "test_objectS.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" #include "tao/PortableServer/ORB_Manager.h" #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Simple_Naming, client, "$Id$") +ACE_RCSID (Simple_Naming, + client, + "$Id$") #if defined (_MSC_VER) # pragma warning (disable : 4250) diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp index 9a97aba8c46..4b580b8ed46 100644 --- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp +++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp @@ -1,12 +1,14 @@ // $Id$ -#include "orbsvcs/Sched/Strategy_Scheduler.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #if defined (ACE_HAS_QUANTIFY) # include <quantify.h> #endif /* ACE_HAS_QUANTIFY */ -ACE_RCSID(Sched, DynSched_Test, "$Id$") +ACE_RCSID (Sched, + DynSched_Test, + "$Id$") // period times, in 100 nanoseconds #define ONE_HZ 10000000 diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp index dcf79635f6c..74272df5877 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp @@ -6,11 +6,13 @@ #include "ace/Sched_Params.h" #include "ace/Get_Opt.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" -ACE_RCSID(Sched_Conf, Sched_Conf, "$Id$") +ACE_RCSID (Sched_Conf, + Sched_Conf, + "$Id$") const char* service_name = "ScheduleService"; diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp index d299eaf939e..cb55b47de58 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp @@ -8,7 +8,6 @@ ACE_RCSID (Big_Request, server, "$Id$") - const char *ior_output_file = 0; diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp index 9ca153929d6..983ce78144a 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp @@ -2,12 +2,10 @@ #include "serverC.h" #include "client_i.h" - ACE_RCSID (Callback, client, "$Id$") - int main (int argc, char *argv[]) { diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp index 759cb390850..9bce1428d73 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp @@ -2,12 +2,10 @@ #include "server_i.h" #include "ace/OS_NS_stdio.h" - ACE_RCSID (Callback, server, "$Id$") - int main (int argc, char *argv[]) { diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp index d2a8c676bc4..f4a66db526f 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp @@ -1,11 +1,9 @@ #include "server_i.h" - ACE_RCSID (Callback, server_i, "$Id$") - server_i::server_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)), client_ () diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp index c014c9abc29..e30b656e067 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp @@ -5,7 +5,9 @@ #include "ace/OS_NS_unistd.h" #include "testC.h" -ACE_RCSID(Send_File, client, "$Id$") +ACE_RCSID (Send_File, + client, + "$Id$") const char *ior = "file://test.ior"; CORBA::Boolean call_shutdown = 0; diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp index 56bfbdd04f1..f731dee89db 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp @@ -5,7 +5,9 @@ #include "ace/OS_NS_unistd.h" #include "test_i.h" -ACE_RCSID(Send_File, server, "$Id$") +ACE_RCSID (Send_File, + server, + "$Id$") const char *ior_output_file = 0; diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp index 89d1ea2c21e..f1eff4cd4bb 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp @@ -6,7 +6,9 @@ #include "test_i.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Send_File, test_i, "$Id$") +ACE_RCSID (Send_File, + test_i, + "$Id$") void Simple_Server_i::send_line (const char * diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp index 5a479d303f4..06a3f9ee203 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp @@ -5,13 +5,15 @@ #include "tao/ORB_Core.h" #include "tao/Thread_Lane_Resources.h" #include "tao/Transport_Cache_Manager.h" -#include "orbsvcs/SSLIOP/SSLIOP_Transport.h" +#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h" #if !defined(__ACE_INLINE__) #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(MT_Server, test_i, "$Id$") +ACE_RCSID (MT_Server, + test_i, + "$Id$") void Simple_Server_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp index f14b6b2b6df..bb1a2f65639 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp @@ -7,7 +7,9 @@ #include "test_i.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(MT_Server, test_i, "$Id$") +ACE_RCSID (MT_Server, + test_i, + "$Id$") CORBA::Long Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED) diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h index 91b7361050b..87f1b47f673 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h @@ -16,7 +16,7 @@ #define SECURE_INVOCATION_FOO_I_H #include "FooS.h" -#include "orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/orbsvcs/SecurityLevel2C.h" class Foo_i : public virtual POA_Foo::Bar , public virtual PortableServer::RefCountServantBase diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp index ea861c51cd2..cfc5da04d59 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp @@ -3,7 +3,7 @@ #include "ace/Get_Opt.h" #include "FooC.h" -#include "orbsvcs/SecurityC.h" +#include "orbsvcs/orbsvcs/SecurityC.h" ACE_RCSID (Secure_Invocation, client, diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h index 51f15de9d38..6e5c3146259 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h @@ -16,7 +16,7 @@ #define TAO_SLEVEL1_TEST_I_H #include "SLevel1_TestS.h" -#include "orbsvcs/SecurityLevel1C.h" +#include "orbsvcs/orbsvcs/SecurityLevel1C.h" #include "openssl/x509.h" class SLevel1_Server_i : public POA_SLevel1_Server diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp index 2c30c19fb17..273aa5f2ecd 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp @@ -4,7 +4,9 @@ #include "SLevel1_TestC.h" -ACE_RCSID (SecurityLevel1, client, "$Id$") +ACE_RCSID (SecurityLevel1, + client, + "$Id$") const char *ior = "file://test.ior"; diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h index 02afd729403..94e0c1c5ae7 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.h +++ b/TAO/orbsvcs/tests/Simple_Naming/client.h @@ -18,8 +18,8 @@ // ============================================================================ #include "test_objectS.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" #include "tao/PortableServer/ORB_Manager.h" #include "ace/Task.h" diff --git a/TAO/orbsvcs/tests/Time/Client_i.h b/TAO/orbsvcs/tests/Time/Client_i.h index 03802c59511..8d00d712578 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.h +++ b/TAO/orbsvcs/tests/Time/Client_i.h @@ -18,8 +18,8 @@ // // ============================================================================ -#include "orbsvcs/TimeServiceC.h" -#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/TimeServiceC.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" class Client_i { diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h index 2a5e78885b3..a4d447cb7d7 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Trader/Trader_Utils.h" +#include "orbsvcs/orbsvcs/Trader/Trader_Utils.h" #include "ttest_export.h" class TAO_TTest_Export TAO_Offer_Importer diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h index 28cf7b442dd..b18406139fb 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h @@ -16,7 +16,7 @@ #ifndef TAO_SIMPLE_DYNAMIC_H #define TAO_SIMPLE_DYNAMIC_H -#include "orbsvcs/Trader/Trader_Utils.h" +#include "orbsvcs/orbsvcs/Trader/Trader_Utils.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp index dfd8d90740e..c19395fb428 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp +++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp @@ -1,7 +1,7 @@ // $Id$ #include "TT_Info.h" -#include "orbsvcs/Trader/Trader_Utils.h" +#include "orbsvcs/orbsvcs/Trader/Trader_Utils.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h index ab18c86d51a..4e4c3d3f9d1 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.h +++ b/TAO/orbsvcs/tests/Trading/TT_Info.h @@ -6,9 +6,9 @@ #include "TTestS.h" #include "ace/Arg_Shifter.h" #include "ace/Read_Buffer.h" -#include "orbsvcs/CosTradingC.h" -#include "orbsvcs/CosTradingReposC.h" -#include "orbsvcs/CosTradingDynamicC.h" +#include "orbsvcs/orbsvcs/CosTradingC.h" +#include "orbsvcs/orbsvcs/CosTradingReposC.h" +#include "orbsvcs/orbsvcs/CosTradingDynamicC.h" #include "ttest_export.h" class TAO_TTest_Export TT_Info diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index 895c8cab06b..cf25819a70a 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -6,10 +6,12 @@ #include "Offer_Exporter.h" #include "Offer_Importer.h" #include "Service_Type_Exporter.h" -#include "orbsvcs/Trader/Trader.h" -#include "orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/orbsvcs/Trader/Trader.h" +#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" -ACE_RCSID(Trading, colocated_test, "$Id$") +ACE_RCSID (Trading, + colocated_test, + "$Id$") void parse_args (int argc, char *argv[], diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index 03cd930d8ea..582c340445e 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -5,10 +5,12 @@ #include "Offer_Importer.h" #include "Service_Type_Exporter.h" #include "ace/Auto_Ptr.h" -#include "orbsvcs/Trader/Trader.h" -#include "orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/orbsvcs/Trader/Trader.h" +#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" -ACE_RCSID(Trading, export_test, "$Id$") +ACE_RCSID (Trading, + export_test, + "$Id$") int main (int argc, char** argv) |