diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams')
41 files changed, 152 insertions, 152 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 3c67f88ee21..f27b97eef2f 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/orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "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 ec98f79d6bd..de4512bf7da 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/orbsvcs/AV/Protocol_Factory.h" +#include "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 a2218860dff..319f6287193 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/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 8c32988eae7..8d9638f4d2e 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/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 371cf9087fd..b4392ed9a4c 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/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 fdf5eca12f6..9d9316756e3 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/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" +#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" 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 38c4f0fc664..af864915393 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/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" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 666894ccecf..1908c9fc033 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/orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "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 4dbf363f16d..7c6383e799c 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/orbsvcs/AV/Protocol_Factory.h" -#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/Protocol_Factory.h" +#include "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 fc9205c72c2..ab6f4753a14 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/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 1870574ee10..19a9c673b8c 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/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 5d9d4971e62..6b5e8ef9e76 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/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 b780e067d95..132c98f1af8 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/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/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" class Client; diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h index 58bbe6da8a7..8ce2dc595c5 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/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" +#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" class Server; diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp index f995c2764d0..02ee69e90a2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" #include "tao/PortableServer/PortableServer.h" #include "tao/Strategies/advanced_resource.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp index 07801f4a170..0bed10e783d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ping.h" -#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/AV/Protocol_Factory.h" #include "tao/ORB.h" #include "tao/Strategies/advanced_resource.h" #include "ace/Get_Opt.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h index 0567cc3f821..88e6fc31b97 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/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/Policy.h" -#include "orbsvcs/orbsvcs/AV/Flows_T.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Policy.h" +#include "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 6153f46b0e6..28ad850add1 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/orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/AV/Protocol_Factory.h" #include "tao/PortableServer/PortableServer.h" #include "tao/Strategies/advanced_resource.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h index c8527c9f6f1..92d90adaad4 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/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/Policy.h" -#include "orbsvcs/orbsvcs/AV/Flows_T.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Policy.h" +#include "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 8af242724c9..9528a063a2a 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/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/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 0be17acd796..4a199dd1922 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/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" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 eab3bf37497..7d03bb5726f 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/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/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" 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 6d0b3a697c9..72235772d22 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h @@ -3,14 +3,14 @@ #include "ace/Get_Opt.h" #include "tao/Strategies/advanced_resource.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/orbsvcs/AV/Transport.h" -#include "orbsvcs/orbsvcs/AV/sfp.h" -#include "orbsvcs/orbsvcs/AV/MCast.h" -#include "orbsvcs/orbsvcs/AV/Policy.h" +#include "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" 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 18ff8ec8671..408ca2e5d09 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/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" +#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" 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 ac21c891ced..87a4c22639b 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/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" +#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" 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 8bc7686cf71..048b89b88be 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/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" +#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" 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 f4f8b4716c2..62b2086a660 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/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" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 772016bf4f8..cfa78e4de09 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/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" +#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" 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 146d1e9486c..23eb5b60957 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h @@ -16,10 +16,10 @@ // // ============================================================================ -#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/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 2fcda3f1f64..4faa8c72ae8 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/orbsvcs/AV/AVStreams_i.h" +#include "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 e860731f0ad..c19b488104f 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/orbsvcs/AV/Protocol_Factory.h" +#include "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 2ab749b7c70..70a4c428c40 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/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/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 3324e95747f..8a41bdeb0da 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/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" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 66dc44f0ef8..2ad409534ab 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/orbsvcs/AV/Protocol_Factory.h" +#include "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 6baa0c53584..0f56e2e2e85 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/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/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 73d30316424..55d31695179 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/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/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 5fbcc6818ec..29837f9dca7 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/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" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 e2694e1be03..77602f53215 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/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/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/AV/Policy.h" #include "Receiver_Stats.h" class Receiver_Callback : public TAO_AV_Callback diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h index c89e0c9d1eb..5ef453cefe9 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/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" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 31291ac620d..e9b9debd8be 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/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/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "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 6d92b5776d2..461c84750d3 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/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" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/AV/Protocol_Factory.h" class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint { |