diff options
854 files changed, 1793 insertions, 1784 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 87d71c9f5f8..f0486fd9e20 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Mon Aug 16 16:45:06 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc: + + Changed muf_client project to inherit from svc_utils. + + * {docs,examples,orbsvcs,performance-tests,utils}/.../*.{cpp,h,idl}: + + Changed #include "orbsvcs/orbsvcs/..." to #include "orbsvcs/...". + Mon Aug 16 18:14:53 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_interface.cpp (gen_stub_ctor): diff --git a/TAO/docs/orbsvcs.html b/TAO/docs/orbsvcs.html index 68f29b61d5f..ae0333c359c 100644 --- a/TAO/docs/orbsvcs.html +++ b/TAO/docs/orbsvcs.html @@ -34,7 +34,7 @@ bgcolor="#ffffff"> so files are included like this:</P> <P><CODE> - #include "orbsvcs/orbsvcs/CosNamingC.h" + #include "orbsvcs/CosNamingC.h" </CODE></P> <P>To simplify the IDL generation the skeletons are also on the diff --git a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp index dfe70557c91..56b0532a42c 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp +++ b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp @@ -3,7 +3,7 @@ // #include "Stock_Factory_i.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/streams.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp index b961ff80081..86d293611bc 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp +++ b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp @@ -3,7 +3,7 @@ // #include "Stock_Factory_i.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/streams.h" int main (int argc, char* argv[]) diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp index 94c6764003f..3660fc9b82d 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp @@ -3,7 +3,7 @@ // #include "Stock_Factory_i.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/streams.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/examples/Advanced/ch_18/server.cpp b/TAO/examples/Advanced/ch_18/server.cpp index 5b8d094b4d3..17b74ff11fa 100644 --- a/TAO/examples/Advanced/ch_18/server.cpp +++ b/TAO/examples/Advanced/ch_18/server.cpp @@ -25,7 +25,7 @@ #include "server.h" #include <algorithm> #include "icp.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" const char * Controller_oid = "Controller"; const unsigned int DeviceLocator_impl::MAX_EQ_SIZE = 100; diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Handler.h index cc0646c0ef2..15f12eb3e58 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.h +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.h @@ -31,8 +31,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/CosNamingC.h" #include "Consumer_Input_Handler.h" #include "Consumer_Signal_Handler.h" diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h index 6e126029194..f9b1a091ed6 100644 --- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h +++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h @@ -22,8 +22,8 @@ #include "Notifier_i.h" #include "NotifierS.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/CosNamingS.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/CosNamingS.h" +#include "orbsvcs/Naming/Naming_Utils.h" class Notifier_Input_Handler : public ACE_Event_Handler { diff --git a/TAO/examples/Callback_Quoter/Supplier_i.h b/TAO/examples/Callback_Quoter/Supplier_i.h index cae78aa15d9..ade4be29bc2 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.h +++ b/TAO/examples/Callback_Quoter/Supplier_i.h @@ -19,8 +19,8 @@ #ifndef SUPPLIER_I_H #define SUPPLIER_I_H -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/CosNamingC.h" #include "ace/Reactor.h" #include "ace/Read_Buffer.h" #include "NotifierC.h" diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp index 7a5969d2c29..4f4368cca67 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp @@ -5,7 +5,7 @@ #include "ace/Process_Manager.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "Web_ServerC.h" #include "Iterator_Handler.h" diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp index e1f4fa883e0..a1c2d6de7e5 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp @@ -3,7 +3,7 @@ // Ossama Othman <ossama@uci.edu> -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "Web_ServerS.h" #include "Iterator_Factory_i.h" diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp index 2daf289a7ff..986c828875a 100644 --- a/TAO/examples/Content_Server/AMI_Observer/client.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp @@ -5,7 +5,7 @@ #include "ace/Process_Manager.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "Push_Web_ServerC.h" #include "Push_Iterator_Handler.h" diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp index 2f83bff364b..83388bc3fb9 100644 --- a/TAO/examples/Content_Server/AMI_Observer/server.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp @@ -3,7 +3,7 @@ // Ossama Othman <ossama@uci.edu> -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "Push_Web_ServerS.h" #include "Push_Iterator_Factory_i.h" diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp index fe5151af49a..a5ec056cc20 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp @@ -5,7 +5,7 @@ #include "ace/FILE_Connector.h" #include "ace/Process_Manager.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "Web_ServerC.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp index f72546b7767..701dccbeac0 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp @@ -3,7 +3,7 @@ // Ossama Othman <ossama@uci.edu> -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "Web_ServerS.h" #include "Iterator_Factory_i.h" diff --git a/TAO/examples/Event_Comm/Consumer_Handler.h b/TAO/examples/Event_Comm/Consumer_Handler.h index 2df1a0b799f..f4b031644d5 100644 --- a/TAO/examples/Event_Comm/Consumer_Handler.h +++ b/TAO/examples/Event_Comm/Consumer_Handler.h @@ -23,8 +23,8 @@ #define _CONSUMER_HANDLER_H #include "Event_Comm_i.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/CosNamingC.h" class Consumer_Handler { diff --git a/TAO/examples/Event_Comm/Notifier_Handler.h b/TAO/examples/Event_Comm/Notifier_Handler.h index 6a13a2485d0..93cbe0a02c8 100644 --- a/TAO/examples/Event_Comm/Notifier_Handler.h +++ b/TAO/examples/Event_Comm/Notifier_Handler.h @@ -24,8 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/CosNamingC.h" class Notifier_Handler { diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h index 3be60e4bc63..e5f3f38b8e1 100644 --- a/TAO/examples/Event_Comm/Notifier_Server.h +++ b/TAO/examples/Event_Comm/Notifier_Server.h @@ -19,8 +19,8 @@ #include "Event_Comm_i.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/CosNamingS.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/CosNamingS.h" +#include "orbsvcs/Naming/Naming_Utils.h" class Notifier_Server { diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp index 7b8721e8014..81e8d8b0d83 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp @@ -7,7 +7,7 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "testC.h" #include "MUF_Scheduler.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" ACE_RCSID(MT_Server, client, "$Id$") diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc index 91fc9b26f27..3fa7f6dcd1e 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc @@ -9,9 +9,8 @@ project(muf_server): kokyu_dsrt_scheduler_server { } } -project(muf_client): orbsvcsexe, kokyu_dsrt_scheduler_client { +project(muf_client): orbsvcsexe, svc_utils, kokyu_dsrt_scheduler_client { exename = muf_client - libs += TAO_Svc_Utils Source_Files { testC.cpp client.cpp diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h index 9d7e8e01dc2..bc70c520427 100644 --- a/TAO/examples/Logging/Logging_Service_i.h +++ b/TAO/examples/Logging/Logging_Service_i.h @@ -32,8 +32,8 @@ #include "ace/Log_Msg.h" #include "ace/OS.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/Naming/Naming_Utils.h" #include "Logger_i.h" #include "LoggerS.h" #include "LoggerC.h" diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp index 6aaad74b114..d04a9f713e7 100644 --- a/TAO/examples/Logging/Logging_Test_i.cpp +++ b/TAO/examples/Logging/Logging_Test_i.cpp @@ -2,7 +2,7 @@ #include "LoggerC.h" #include "Logging_Test_i.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "tao/debug.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram_Mcast.h" diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/examples/Logging/Logging_Test_i.h index 753b0cd7bc0..05ad3ea7a89 100644 --- a/TAO/examples/Logging/Logging_Test_i.h +++ b/TAO/examples/Logging/Logging_Test_i.h @@ -28,9 +28,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "LoggerC.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Naming/Naming_Utils.h" class Logger_Client { diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp index 340bb6d7e78..12516fcb83a 100644 --- a/TAO/examples/Quoter/Generic_Factory.cpp +++ b/TAO/examples/Quoter/Generic_Factory.cpp @@ -15,7 +15,7 @@ #include "Generic_Factory.h" -#include "orbsvcs/orbsvcs/LifeCycleServiceC.h" +#include "orbsvcs/LifeCycleServiceC.h" ACE_RCSID (Quoter, Generic_Factory, diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp index be51846ebe7..7dec1d90a22 100644 --- a/TAO/examples/Quoter/client.cpp +++ b/TAO/examples/Quoter/client.cpp @@ -2,7 +2,7 @@ #include "ace/Read_Buffer.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "client.h" diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h index f171180c031..d5014c872c8 100644 --- a/TAO/examples/Quoter/client.h +++ b/TAO/examples/Quoter/client.h @@ -28,7 +28,7 @@ #include "QuoterC.h" -#include "orbsvcs/orbsvcs/CosLifeCycleC.h" +#include "orbsvcs/CosLifeCycleC.h" #include "ace/Task.h" #include "ace/Thread_Manager.h" diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h index 1b3362e8c1d..fe681790c66 100644 --- a/TAO/examples/Quoter/server.h +++ b/TAO/examples/Quoter/server.h @@ -28,8 +28,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Log_Msg.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/Naming/Naming_Utils.h" #include "tao/PortableServer/ORB_Manager.h" #include "Quoter_i.h" #include "QuoterC.h" diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h index 699bc523440..ea5cef35093 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.h +++ b/TAO/examples/RTCORBA/Activity/Activity.h @@ -18,7 +18,7 @@ #include "ace/Singleton.h" #include "ace/Sched_Params.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "tao/RTPortableServer/RTPortableServer.h" #include "tao/RTCORBA/Priority_Mapping_Manager.h" #include "activity_export.h" diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h index fa71c73a8f7..5b333145f0b 100644 --- a/TAO/examples/RTCORBA/Activity/Builder.h +++ b/TAO/examples/RTCORBA/Activity/Builder.h @@ -13,7 +13,7 @@ #ifndef BUILDER_H #define BUILDER_H -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "tao/RTPortableServer/RTPortableServer.h" class Periodic_Task; diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h index 5a889cc0a29..f5263b88645 100644 --- a/TAO/examples/RTScheduling/DT_Creator.h +++ b/TAO/examples/RTScheduling/DT_Creator.h @@ -2,7 +2,7 @@ #ifndef DT_CREATOR_H #define DT_CREATOR_H -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/Service_Config.h" #include "ace/Service_Object.h" #include "tao/RTScheduling/RTScheduler.h" diff --git a/TAO/examples/RTScheduling/Starter.h b/TAO/examples/RTScheduling/Starter.h index 4a717c0a367..2c499cfda05 100644 --- a/TAO/examples/RTScheduling/Starter.h +++ b/TAO/examples/RTScheduling/Starter.h @@ -2,7 +2,7 @@ #ifndef STARTER_H #define STARTER_H -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Naming/Naming_Utils.h" #include "SynchC.h" #include "ace/SString.h" #include "ace/Hash_Map_Manager.h" diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h index bf6ba78109f..05336bb5f42 100644 --- a/TAO/examples/Simple/Simple_util.h +++ b/TAO/examples/Simple/Simple_util.h @@ -20,7 +20,7 @@ #define TAO_UTIL_H #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Naming/Naming_Utils.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index 64597a89f24..d3f8aae7059 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -26,8 +26,8 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/orbsvcs/Runtime_Scheduler.h" +#include "orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/Runtime_Scheduler.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "tao/PortableServer/ORB_Manager.h" diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h index d27b2152df3..5595ed23148 100644 --- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h +++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h @@ -23,7 +23,7 @@ #define IOR_CORBALOC_CLIENT_I_H #include "corbalocC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/SString.h" diff --git a/TAO/examples/ior_corbaloc/server.cpp b/TAO/examples/ior_corbaloc/server.cpp index 415daf348c1..b5351d69be2 100644 --- a/TAO/examples/ior_corbaloc/server.cpp +++ b/TAO/examples/ior_corbaloc/server.cpp @@ -3,7 +3,7 @@ #include "status_i.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" int main (int argc, char* argv[]) { diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h index 38d5bb7ad7e..18a728b7e86 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h @@ -28,8 +28,8 @@ #include "ace/Log_Msg.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Concurrency/Concurrency_Utils.h" +#include "orbsvcs/Naming/Naming_Utils.h" class Concurrency_Service : public TAO_ORB_Manager { diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp index 4dfc74e1fde..2bb2e9205ac 100644 --- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp +++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/CosEvent/CEC_Event_Loader.h" #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" #include "ace/OS_main.h" diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp index 90c6ad963d1..414aa3075b5 100644 --- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp +++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp @@ -6,8 +6,8 @@ #include "ace/Argv_Type_Converter.h" #include "ace/OS_main.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/Scheduler_Factory.h" ACE_RCSID (Dump_Schedule, Dump_Schedule, diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp index f8dad651a53..c0355d78d0f 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.cpp +++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp @@ -7,14 +7,14 @@ #include "ace/Argv_Type_Converter.h" #include "ace/OS_main.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/orbsvcs/Event/Module_Factory.h" -#include "orbsvcs/orbsvcs/Event/Event_Channel.h" - -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/Event/Event_Channel.h" + +#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Event_Channel.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h index a97012f6900..6e6065f292b 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.h +++ b/TAO/orbsvcs/Event_Service/Event_Service.h @@ -12,12 +12,12 @@ #define EC_EVENT_SERVICE_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/RtecSchedulerS.h" #include "ace/SString.h" class TAO_Module_Factory; diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp index b4568f7dba7..8f9e7124820 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp @@ -7,9 +7,9 @@ #include "ace/INET_Addr.h" #include "ace/SOCK_Connector.h" #include "ace/SOCK_Stream.h" -#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h" +#include "orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h" #include "ace/OS_main.h" ACE_RCSID (Event_Service, diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h index 958173e1715..64fd3722ff6 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h @@ -12,10 +12,10 @@ #ifndef FT_EVENTSERVICE_H #define FT_EVENTSERVICE_H -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" -#include "orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" +#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h" #include "TP_Task.h" namespace POA_RtecScheduler diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index a46723ae7fd..35a72e48214 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -5,7 +5,7 @@ #include "ace/Read_Buffer.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Stream.h" -#include "orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h" +#include "orbsvcs/FtRtEvent/Utils/UUID.h" ACE_RCSID (Factory_Service, EventChannelFactory_i, diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h index bd0c8a0b174..656df7363bf 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h @@ -13,7 +13,7 @@ #ifndef EVENTCHANNELFACTORY_I_H #define EVENTCHANNELFACTORY_I_H -#include "orbsvcs/orbsvcs/FT_CORBAS.h" +#include "orbsvcs/FT_CORBAS.h" #include "ace/Synch.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp index 4ebd1ce8f4d..3a8a8db6714 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp @@ -2,13 +2,13 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -#include "orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" -#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" +#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" /// include this file to statically linked with FT ORB -#include "orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h" +#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" /// include this file to statically linked with Transaction Depth -#include "orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" +#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" ACE_RCSID (Gateway_Service, FTRTEC_Gateway_Service, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp index c1c9cec8356..83df60813d3 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp @@ -12,10 +12,10 @@ //============================================================================= #include "FT_DefaultFaultAnalyzer.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/FT_NotifierC.h" -#include "orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h" -#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/FT_NotifierC.h" +#include "orbsvcs/FT_FaultDetectorFactoryC.h" +#include "orbsvcs/FT_ReplicationManagerC.h" #include "orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h index ccf11188739..814162e6662 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "FT_ReplicationManagerLib_export.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyCommC.h" namespace TAO { diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp index 68c97c8833e..2464d558f1a 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp @@ -17,7 +17,7 @@ //============================================================================= #include "FT_FaultConsumer.h" -#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h" +#include "orbsvcs/FT_ReplicationManagerC.h" #include "orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h index 38bf8e8b347..4ce246a321a 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h @@ -22,8 +22,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyCommS.h" -#include "orbsvcs/orbsvcs/FT_NotifierC.h" +#include "orbsvcs/CosNotifyCommS.h" +#include "orbsvcs/FT_NotifierC.h" #include "FT_ReplicationManagerLib_export.h" namespace TAO diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h index 2c8ce6cb62d..d0b64b49e4f 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h @@ -22,8 +22,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/FT_CORBAC.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/FT_CORBAC.h" +#include "orbsvcs/PortableGroupC.h" #include "FT_ReplicationManagerLib_export.h" namespace TAO diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp index e2df60d3357..205f9f96d63 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp @@ -1,6 +1,6 @@ #include "FT_Property_Validator.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h" -#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h" +#include "orbsvcs/PortableGroup/PG_Operators.h" +#include "orbsvcs/FT_ReplicationManagerC.h" ACE_RCSID (PortableGroup, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h index 6b389719098..cc5912f9b36 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h @@ -15,8 +15,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroup/PG_Default_Property_Validator.h" +#include "orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index 28e2ebd144a..b0e7514c829 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -22,13 +22,13 @@ #include "tao/IORTable/IORTable.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/PortableGroup/PG_Object_Group.h" +#include "orbsvcs/PortableGroup/PG_Property_Set.h" +#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "orbsvcs/PortableGroup/PG_conf.h" -#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h" ACE_RCSID (FT_ReplicationManager, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp index 326235cde9c..ecce2c241ae 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp @@ -12,13 +12,13 @@ //============================================================================= #include "FT_ReplicationManagerFaultAnalyzer.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/FT_NotifierC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/FT_NotifierC.h" #include "orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h" #include "orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h" -#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "orbsvcs/PortableGroup/PG_Operators.h" +#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "tao/debug.h" #include <iostream> diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h index 1149c2e149f..f15238af5bf 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h @@ -24,7 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h" -#include "orbsvcs/orbsvcs/FT_CORBAC.h" +#include "orbsvcs/FT_CORBAC.h" // Forward declarations. template <class T> class ACE_Unbounded_Set; diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp index 30ba12055a6..ef7637ddf64 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -14,8 +14,8 @@ #include "Fault_Detector_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/PortableGroup/PG_Property_Set.h" // Use this macro at the beginning of CORBA methods // to aid in debugging. diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h index 9f5d76029cf..d5882ad1a15 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h @@ -36,8 +36,8 @@ namespace TAO } -#include "orbsvcs/orbsvcs/FT_NotifierC.h" -#include "orbsvcs/orbsvcs/FT_ReplicaC.h" +#include "orbsvcs/FT_NotifierC.h" +#include "orbsvcs/FT_ReplicaC.h" #include "ace/Time_Value.h" diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp index 4ce922eda83..f598d35bb93 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp @@ -2,11 +2,11 @@ // $Id$ #include "IFR_Service.h" -#include "orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h" -#include "orbsvcs/orbsvcs/IFRService/Options.h" -#include "orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h" -#include "orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h" -#include "orbsvcs/orbsvcs/IOR_Multicast.h" +#include "orbsvcs/IFRService/ComponentRepository_i.h" +#include "orbsvcs/IFRService/Options.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IOR_Multicast.h" #include "tao/IORTable/IORTable.h" #include "tao/ORB_Core.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h index a66487d1896..566eec1207a 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.h +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h @@ -17,7 +17,7 @@ #define IFR_SERVICE_H #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h index ba73720cb32..71e5dd3eab4 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h @@ -17,7 +17,7 @@ #include "Server_Repository.h" -#include "orbsvcs/orbsvcs/IOR_Multicast.h" +#include "orbsvcs/IOR_Multicast.h" #include "tao/PortableServer/ImplRepoS.h" #include "tao/IORTable/IORTable.h" diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index fa08b1b2df3..f2971a7fbc5 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -7,7 +7,7 @@ #include "INS_Locator.h" #include "Adapter_Activator.h" -#include "orbsvcs/orbsvcs/IOR_Multicast.h" +#include "orbsvcs/IOR_Multicast.h" #include "tao/IORTable/IORTable.h" #include "tao/PortableServer/POA.h" diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h index 6551226a03b..d170b8fdca1 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h @@ -14,8 +14,8 @@ // ============================================================================ -#include "orbsvcs/orbsvcs/CosLifeCycleC.h" -#include "orbsvcs/orbsvcs/LifeCycleServiceC.h" +#include "orbsvcs/CosLifeCycleC.h" +#include "orbsvcs/LifeCycleServiceC.h" #ifndef CRITERIA_EVALUATOR_H_H #define CRITERIA_EVALUATOR_H_H diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp index 9fd155d9179..f088231c4f2 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp @@ -20,7 +20,7 @@ // ============================================================================ #include "Factory_Trader.h" -#include "orbsvcs/orbsvcs/CosTradingC.h" +#include "orbsvcs/CosTradingC.h" ACE_RCSID (LifeCycle_Service, Factory_Trader, diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h index 5a42d04a3cb..ebf8a024d32 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h @@ -17,9 +17,9 @@ #ifndef FACTORY_TRADER_H #define FACTORY_TRADER_H -#include "orbsvcs/orbsvcs/Trader/Trader.h" -#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" -#include "orbsvcs/orbsvcs/CosLifeCycleC.h" +#include "orbsvcs/Trader/Trader.h" +#include "orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/CosLifeCycleC.h" class Factory_Trader diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp index b0a3411bbaa..a1e011451b8 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp @@ -15,7 +15,7 @@ #include "ace/Get_Opt.h" -#include "orbsvcs/orbsvcs/LifeCycleServiceC.h" +#include "orbsvcs/LifeCycleServiceC.h" #include "LifeCycle_Service_i.h" diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h index 562d97451de..2997da242a5 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h @@ -13,7 +13,7 @@ // // ============================================================================ -#include "orbsvcs/orbsvcs/LifeCycleServiceS.h" +#include "orbsvcs/LifeCycleServiceS.h" #include "Factory_Trader.h" #include "Criteria_Evaluator.h" diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp index e554d610122..c1976869d18 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp @@ -1,6 +1,6 @@ #include "Signal_Handler.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h" +#include "orbsvcs/LoadBalancing/LB_LoadManager.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp index aaadc7a2e05..f358baac632 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp @@ -1,8 +1,8 @@ #include "Push_Handler.h" #include "Monitor_Signal_Handler.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LB_conf.h" +#include "orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h" +#include "orbsvcs/LoadBalancing/LB_conf.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h index 97d44eeb471..aee41ca5e76 100644 --- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h +++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h @@ -20,7 +20,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" /** diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.h b/TAO/orbsvcs/LoadBalancer/Push_Handler.h index 1faa67aaf3b..7913a399f72 100644 --- a/TAO/orbsvcs/LoadBalancer/Push_Handler.h +++ b/TAO/orbsvcs/LoadBalancer/Push_Handler.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #include "ace/Event_Handler.h" diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h index 8bcbfcecf2d..33e76280889 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h @@ -21,7 +21,7 @@ #define TAO_NAMING_SERVICE_H #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Naming/Naming_Utils.h" class TAO_Naming_Service { diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h index 52af603fc0b..e0de0ef0a8e 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.h +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h @@ -20,8 +20,8 @@ #include "ace/Task.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/CosNamingC.h" #include "../orbsvcs/Notify/CosNotify_Initializer.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp index a071c1b0fc1..3da4c4e1039 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp @@ -5,7 +5,7 @@ #include "ace/Get_Opt.h" #include "ace/Auto_Ptr.h" #include "ace/Argv_Type_Converter.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/OS_main.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h index 2ed1d8f10f8..e76f5c63b15 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h @@ -26,11 +26,11 @@ #define TAO_SCHEDULING_SERVICE_H #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h" +#include "orbsvcs/Sched/Reconfig_Scheduler.h" #if defined (TAO_USES_STRATEGY_SCHEDULER) -#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h" +#include "orbsvcs/Sched/Strategy_Scheduler.h" #endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */ -#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/Sched/Config_Scheduler.h" #include "ace/SString.h" class TAO_Scheduling_Service diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h index 6892d90987a..3bc63984540 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.h +++ b/TAO/orbsvcs/Time_Service/Clerk_i.h @@ -20,9 +20,9 @@ #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Time/TAO_Time_Service_Clerk.h" class Clerk_i { diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h index 6cc665c12ed..40cbc8237a1 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.h +++ b/TAO/orbsvcs/Time_Service/Server_i.h @@ -20,9 +20,9 @@ #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Time/TAO_Time_Service_Server.h" class Server_i { diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h index 29d4bd2fef4..55f5073f798 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.h +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h @@ -24,10 +24,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/IOR_Multicast.h" -#include "orbsvcs/orbsvcs/Trader/Trader.h" -#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" -#include "orbsvcs/orbsvcs/Trader/Trading_Loader.h" +#include "orbsvcs/IOR_Multicast.h" +#include "orbsvcs/Trader/Trader.h" +#include "orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/Trader/Trading_Loader.h" class Trading_Service; diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl index 59446678f5a..ffeff6c5f94 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl @@ -36,7 +36,7 @@ #ifndef TAO_COSEVENTCHANNELFACTORY_IDL #define TAO_COSEVENTCHANNELFACTORY_IDL -#include "orbsvcs/orbsvcs/CosEventChannelAdmin.idl" +#include "orbsvcs/CosEventChannelAdmin.idl" module CosEventChannelFactory { diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp index c3661adf5eb..60210ad8515 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp @@ -2,7 +2,7 @@ // $Id$ #include "CosEventChannelFactory_i.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "tao/PortableServer/PortableServer.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h index 520fc37d382..628383b8ed2 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h @@ -23,7 +23,7 @@ #include /**/ "ace/pre.h" #include "CosEventChannelFactoryS.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp index 2161591ffef..72c9ebc763b 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp @@ -2,7 +2,7 @@ // $Id$ #include "CosEventChannelFactoryC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/Log_Msg.h" class FactoryClient diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h index d60f76a6c68..e07d4c843f1 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h @@ -22,7 +22,7 @@ #define TAO_FACTORYDRIVER_H #include "CosEventChannelFactory_i.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Naming/Naming_Utils.h" // @@ Pradeep: I know this is just an example, but could you talk to // Vishal about making this a service that could be bootstraped diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp index aeb77be05a1..68f393240e7 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp @@ -1,7 +1,7 @@ // $Id$ #include "RtEC_Based_CosEC.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Default_Factory.h" #include "ace/Get_Opt.h" RtEC_Based_CosEC::RtEC_Based_CosEC (void) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h index 6a66feb0f76..72f1bd8224f 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h @@ -17,7 +17,7 @@ #define RTEC_BASED_COSEC_H #include "CosEvent_Utilities.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #if defined (_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h index 22284842ca5..5381540bb2c 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h @@ -22,8 +22,8 @@ #define CONSUMERADMIN_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "ProxyPushSupplier_i.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp index f2520c36c0b..41da6bcd3b4 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp @@ -2,8 +2,8 @@ // $Id$ #include "CosEvent_Utilities.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event_Service_Constants.h" #include "EventChannel_i.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h index 644d57fab98..a55db26014c 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h @@ -21,10 +21,10 @@ #define TAO_COSEVENT_UTILITIES_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecBaseC.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/RtecBaseC.h" +#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/Event_Utilities.h" #include "rtec_cosec_export.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h index 14ffd0da9f9..03b96d3847f 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h @@ -22,8 +22,8 @@ #define EVENTCHANNEL_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/CosEventChannelAdminC.h" #include "ConsumerAdmin_i.h" #include "SupplierAdmin_i.h" diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp index dfd35b67112..73311b2af45 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp @@ -1,11 +1,11 @@ /* -*- C++ -*- */ // $Id$ -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/CosEventCommS.h" #include "ProxyPushConsumer_i.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h index b8ae2bc3c36..ce07097b36f 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h @@ -22,8 +22,8 @@ #define _PROXYPUSHCONSUMER_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "rtec_cosec_export.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp index 38fb66a0291..52c99def13d 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp @@ -1,10 +1,10 @@ // $Id$ // -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventCommS.h" +#include "orbsvcs/RtecEventCommS.h" #include "ProxyPushSupplier_i.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h index ded678af2d4..b1adfc0b0bc 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h @@ -22,8 +22,8 @@ #define _PROXYPUSHSUPPLIER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/CosEventChannelAdminC.h" #include "rtec_cosec_export.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h index 0e2a79802c4..30c3435bdef 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h @@ -22,8 +22,8 @@ #define SUPPLIER_ADMIN_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/CosEventChannelAdminC.h" #include "ProxyPushConsumer_i.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h index f62fd70e6af..c1ced5cbc08 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h @@ -17,10 +17,10 @@ #ifndef COSECCONSUMER_H_ #define COSECCONSUMER_H_ -#include "orbsvcs/orbsvcs/CosEventCommC.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosEventCommS.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventCommC.h" +#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/CosEventCommS.h" +#include "orbsvcs/CosEventChannelAdminS.h" class Consumer : public POA_CosEventComm::PushConsumer { diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h index 7bd54f164de..413244fc4f4 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h @@ -17,10 +17,10 @@ #ifndef COSECSUPPLIER_H_ #define COSECSUPPLIER_H_ -#include "orbsvcs/orbsvcs/CosEventCommC.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosEventCommS.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventCommC.h" +#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/CosEventCommS.h" +#include "orbsvcs/CosEventChannelAdminS.h" class Supplier : public POA_CosEventComm::PushSupplier { diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h index 0c547769e90..ce523fed960 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h @@ -17,10 +17,10 @@ #ifndef COSECCONSUMER_H_ #define COSECCONSUMER_H_ -#include "orbsvcs/orbsvcs/CosEventCommC.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosEventCommS.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventCommC.h" +#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/CosEventCommS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "Multiple.h" class Consumer : public POA_CosEventComm::PushConsumer, public Multiple diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h index 883c5d20dcf..1687f0374a7 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h @@ -17,9 +17,9 @@ #ifndef COSECMULTIPLE_H #define COSECMULTIPLE_H -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/CosEventChannelAdminC.h" class Multiple { diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h index bcc3bf9f145..29b213cd31f 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h @@ -17,10 +17,10 @@ #ifndef COSECSUPPLIER_H_ #define COSECSUPPLIER_H_ -#include "orbsvcs/orbsvcs/CosEventCommC.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosEventCommS.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventCommC.h" +#include "orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/CosEventCommS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "Multiple.h" class Supplier : public POA_CosEventComm::PushSupplier, diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index 81d992eb24b..578cebcefd0 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" ACE_RCSID (CosEC_Examples, Consumer, diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h index cf672b12d27..7156353e483 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h @@ -17,7 +17,7 @@ #ifndef CONSUMER_H #define CONSUMER_H -#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/CosEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp index 9dbb168736a..f9fee3e6b0d 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp index 85d26f07d32..099735ce5f7 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (CosEC_Examples, diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h index 7771693bd2e..4fdc39bfa08 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h @@ -17,7 +17,7 @@ #ifndef SUPPLIER_H #define SUPPLIER_H -#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/CosEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp index aa6cea972e4..b1858fb720a 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminC.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/CosTypedEventChannelAdminC.h" #include "Country_i.h" ACE_RCSID (CosEC_Examples, diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl index 124de09b122..77c68564272 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl @@ -5,7 +5,7 @@ #ifndef TAO_COUNTRY_IDL #define TAO_COUNTRY_IDL -#include "orbsvcs/orbsvcs/CosTypedEventComm.idl" +#include "orbsvcs/CosTypedEventComm.idl" #pragma prefix "jon.com" interface Country : ::CosTypedEventComm::TypedPushConsumer diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp index 176a2ecbc31..c908d935e80 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminC.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/CosTypedEventChannelAdminC.h" #include "CountryC.h" ACE_RCSID(CosEC_Examples, Supplier, "$Id:") diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h index 4e41cac3de1..b06ffc65f92 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h @@ -17,8 +17,8 @@ #ifndef TLS_CLIENT_H #define TLS_CLIENT_H -#include "orbsvcs/orbsvcs/DsLogAdminC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/DsLogAdminC.h" +#include "orbsvcs/CosNamingC.h" class TLS_Client { diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index 357cced7a5d..b8dc8157a18 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -1,5 +1,5 @@ #include "Event_Consumer.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_main.h" ACE_RCSID (Event, diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h index 0f8339d9e11..946299dc55d 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h @@ -17,9 +17,9 @@ #ifndef EVENT_CONSUMER_H #define EVENT_CONSUMER_H -#include "orbsvcs/orbsvcs/DsEventLogAdminC.h" -#include "orbsvcs/orbsvcs/CosEventCommS.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/DsEventLogAdminC.h" +#include "orbsvcs/CosEventCommS.h" +#include "orbsvcs/CosNamingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp index fc2d84cbe72..1fee4da0b1a 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp @@ -1,5 +1,5 @@ #include "Event_Supplier.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_main.h" ACE_RCSID (Event, diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h index 4a66e3ab074..c37b9a5c9df 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h @@ -17,9 +17,9 @@ #ifndef EVENT_SUPPLIER_H #define EVENT_SUPPLIER_H -#include "orbsvcs/orbsvcs/DsEventLogAdminC.h" -#include "orbsvcs/orbsvcs/CosEventCommS.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/DsEventLogAdminC.h" +#include "orbsvcs/CosEventCommS.h" +#include "orbsvcs/CosNamingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp index 83a910e565a..6c7c5447c96 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp @@ -1,6 +1,6 @@ #include "Notify_Consumer.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "ace/OS_main.h" ACE_RCSID (Notify, diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h index 484963ddf43..3b9cb99b1e5 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h @@ -17,11 +17,11 @@ #ifndef NOTIFY_CONSUMER_H #define NOTIFY_CONSUMER_H -#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" -#include "orbsvcs/orbsvcs/DsEventLogAdminC.h" -#include "orbsvcs/orbsvcs/CosEventCommS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommS.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/DsEventLogAdminC.h" +#include "orbsvcs/CosEventCommS.h" +#include "orbsvcs/CosNotifyCommS.h" +#include "orbsvcs/CosNamingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index 14dcf3155d8..5a8edb31e03 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp @@ -1,5 +1,5 @@ #include "Notify_Supplier.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "ace/OS_main.h" ACE_RCSID (Notify, diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h index 7e68335f786..ecba0889eaa 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h @@ -17,10 +17,10 @@ #ifndef NOTIFY_SUPPLIER_H #define NOTIFY_SUPPLIER_H -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/DsNotifyLogAdminC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/CosNotifyCommS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/DsNotifyLogAdminC.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommS.h" class Filter_StructuredPushSupplier; diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp index ebf87ba501c..396b9e8c77e 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp @@ -1,6 +1,6 @@ #include "RTEvent_Consumer.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Event_Service_Constants.h" #include "ace/OS_main.h" ACE_RCSID (RTEvent, diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h index cbdeb7b1d80..5c908495901 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h @@ -17,9 +17,9 @@ #ifndef RTEVENT_CONSUMER_H #define RTEVENT_CONSUMER_H -#include "orbsvcs/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RTEventLogAdminC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RTEventLogAdminC.h" +#include "orbsvcs/CosNamingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index 8af49c7efc9..a98457d4f72 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -1,6 +1,6 @@ #include "RTEvent_Supplier.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Event_Service_Constants.h" #include "ace/OS_main.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h index 1d05033b459..170a98db896 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h @@ -17,9 +17,9 @@ #ifndef RTEVENT_SUPPLIER_H #define RTEVENT_SUPPLIER_H -#include "orbsvcs/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RTEventLogAdminC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RTEventLogAdminC.h" +#include "orbsvcs/CosNamingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index ec4101f7ca7..e0960aed1a6 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -16,9 +16,9 @@ #ifndef NOTIFY_FILTER_CLIENT_H #define NOTIFY_FILTER_CLIENT_H -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/SString.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h index 4194e62bd31..bc7a3316a5c 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h @@ -16,8 +16,8 @@ #include "ORB_Objects.h" #include "tao/RTCORBA/RTCORBA.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" #include "ace/SString.h" /** diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index 2b29678007d..2a1c42434b4 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -4,8 +4,8 @@ #include "Consumer.h" #include "ORB_Run_Task.h" #include "ace/Arg_Shifter.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/CosNamingC.h" #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h index 2cbab1c3352..e846e43303b 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h @@ -16,8 +16,8 @@ #include "tao/RTCORBA/RTCORBA.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/CosNamingC.h" /** * @class TAO_Notify_ORB_Objects diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h index d01675cb10b..33182f595ee 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h @@ -15,8 +15,8 @@ #include "ORB_Objects.h" #include "tao/RTCORBA/RTCORBA.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" #include "ace/SString.h" #include "ace/Condition_Thread_Mutex.h" diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index bd760366a36..f3aa4a7322e 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -7,8 +7,8 @@ #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "Supplier.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_errno.h" ACE_RCSID (Notify, TAO_Notify_Lanes_Supplier_Client, "$Id$") diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h index ff46bc4e5a1..b9b05c2d39e 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -16,9 +16,9 @@ #ifndef NOTIFY_SUBSCRIBE_CLIENT_H #define NOTIFY_SUBSCRIBE_CLIENT_H -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNamingC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h index 614bc45268f..ffe7ad82f73 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h @@ -16,8 +16,8 @@ #include "ORB_Objects.h" #include "tao/RTCORBA/RTCORBA.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" #include "ace/SString.h" #include "ace/OS_NS_time.h" diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index 4b4aa0283bf..11e04f8f4dc 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -4,8 +4,8 @@ #include "Consumer.h" #include "ORB_Run_Task.h" #include "ace/Arg_Shifter.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/CosNamingC.h" #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h index 9ec6510cb60..7ca6ab99442 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h @@ -15,8 +15,8 @@ #include "tao/RTCORBA/RTCORBA.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/CosNamingC.h" /** * @class TAO_Notify_ORB_Objects diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h index e19d6b55401..1a3c7893c76 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h @@ -15,8 +15,8 @@ #include "ORB_Objects.h" #include "tao/RTCORBA/RTCORBA.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" #include "ace/Condition_Thread_Mutex.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index bc23e0c05b3..ed563e2e69d 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -7,8 +7,8 @@ #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "Supplier.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/NotifyExtC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_errno.h" ACE_RCSID (Notify, TAO_Notify_ThreadPool_Supplier_Client, "$Id$") diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp index 1f6d7a9e796..17ae07e376a 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp @@ -1,10 +1,10 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/CosNamingC.h" #include "ace/Arg_Shifter.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h index e096cc9d86b..c8268e1c3ea 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h @@ -12,7 +12,7 @@ #ifndef CONSUMER_H #define CONSUMER_H -#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp index ad503080423..29e85721e86 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp @@ -1,12 +1,12 @@ // $Id$ #include "EC.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Event/EC_Gateway.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/Event/EC_Gateway.h" #include "ace/Arg_Shifter.h" ACE_RCSID (EC_Examples, diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h index ee85894676e..2734de1dcd0 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h @@ -12,7 +12,7 @@ #ifndef EC_H #define EC_H -#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp index 17944dad818..11a219fd352 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp @@ -1,11 +1,11 @@ // $Id$ #include "Gateway.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h" -#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h" #include "ace/Arg_Shifter.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h index d54c2519354..6c7d931d988 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h @@ -11,7 +11,7 @@ #ifndef GATEWAY_H #define GATEWAY_H -#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp index ce16ed2237e..6d8586d16a8 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp @@ -1,10 +1,10 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/CosNamingC.h" #include "ace/Arg_Shifter.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h index 65e67be9ed9..98e87ec39d2 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h @@ -11,7 +11,7 @@ #ifndef SUPPLIER_H #define SUPPLIER_H -#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h index 41e999a9416..8439914f22b 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h @@ -18,7 +18,7 @@ #define ADDRSERVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/RtecUDPAdminS.h" class AddrServer : public POA_RtecUDPAdmin::AddrServer { diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp index 8d41d2b200d..dba1cb22b01 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp @@ -1,8 +1,8 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/Event_Service_Constants.h" ACE_RCSID (EC_Examples, Consumer, diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h index 5a8a514e190..536404b824b 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h @@ -17,8 +17,8 @@ #ifndef CONSUMER_H #define CONSUMER_H -#include "orbsvcs/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp index 052a5fe8280..4ab33c1ee29 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp @@ -4,13 +4,13 @@ #include "Consumer.h" #include "Supplier.h" #include "AddrServer.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 "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 "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp index 84a8d5a9f10..f83b00c5864 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp @@ -1,8 +1,8 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/Event_Service_Constants.h" ACE_RCSID (EC_Examples, Supplier, diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h index a44b55a18aa..7c591f5fdb7 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h @@ -17,8 +17,8 @@ #ifndef SUPPLIER_H #define SUPPLIER_H -#include "orbsvcs/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h index e89e7df6977..bdbdbaad894 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h @@ -17,7 +17,7 @@ #ifndef CONSUMER_H #define CONSUMER_H -#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h b/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h index 71197184d8e..3a6d4463fa3 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h @@ -3,7 +3,7 @@ // This file was automatically generated by the Scheduler_Factory. // Before editing the file please consider generating it again. -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Scheduler_Factory.h" // There were no scheduling anomalies. diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index fcf9123becd..1011f5d53bc 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h" -#include "orbsvcs/orbsvcs/Runtime_Scheduler.h" -#include "orbsvcs/orbsvcs/Event/Module_Factory.h" -#include "orbsvcs/orbsvcs/Event/Event_Channel.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.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/Sched/Reconfig_Scheduler.h" +#include "orbsvcs/Runtime_Scheduler.h" +#include "orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" #include "Consumer.h" #include "Supplier.h" diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h index c2a428371a6..b0391f7602b 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h @@ -17,7 +17,7 @@ #ifndef SUPPLIER_H #define SUPPLIER_H -#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp index 18d42999eab..d49a22fa62a 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp @@ -1,9 +1,9 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/CosNamingC.h" ACE_RCSID (EC_Examples, Consumer, diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h index ebbcb6fa5f9..19005b96ec1 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h @@ -17,7 +17,7 @@ #ifndef CONSUMER_H #define CONSUMER_H -#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp index 9b4692a69ed..4bc618c1232 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" #include "ace/Get_Opt.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" ACE_RCSID (EC_Examples, diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp index a91a5f8ec05..850888b1d77 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp @@ -1,9 +1,9 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (EC_Examples, diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h index e358500267d..b1fce544ccc 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h @@ -17,7 +17,7 @@ #ifndef SUPPLIER_H #define SUPPLIER_H -#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventCommS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index b5b79a52ae4..f53b3ddba1d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -29,20 +29,20 @@ #include "ace/SOCK_Acceptor.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/AV/AV_export.h" -#include "orbsvcs/orbsvcs/CosPropertyServiceS.h" -#include "orbsvcs/orbsvcs/AVStreamsS.h" -#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/AV/AV_Core.h" -#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/orbsvcs/Null_MediaCtrlS.h" +#include "orbsvcs/AV/AV_export.h" +#include "orbsvcs/CosPropertyServiceS.h" +#include "orbsvcs/AVStreamsS.h" +#include "orbsvcs/Property/CosPropertyService_i.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/AV/AV_Core.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/Null_MediaCtrlS.h" #if defined (TAO_ORBSVCS_HAS_Trader) -#include "orbsvcs/orbsvcs/Trader/Trader.h" +#include "orbsvcs/Trader/Trader.h" #endif /* TAO_ORBSVCS_HAS_Trader */ -#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" #define FLOWSPEC_MAX 5 // for the Hash_Map helper classes. diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index f97ad1cb0aa..08597e73734 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -1,22 +1,22 @@ // $Id$ -#include "orbsvcs/orbsvcs/AV/AV_Core.h" -#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h" -#include "orbsvcs/orbsvcs/AV/Transport.h" -#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" -#include "orbsvcs/orbsvcs/AV/UDP.h" -#include "orbsvcs/orbsvcs/AV/TCP.h" -#include "orbsvcs/orbsvcs/AV/RTP.h" -#include "orbsvcs/orbsvcs/AV/RTCP.h" -#include "orbsvcs/orbsvcs/AV/sfp.h" -#include "orbsvcs/orbsvcs/AV/default_resource.h" +#include "orbsvcs/AV/AV_Core.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/Transport.h" +#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/AV/UDP.h" +#include "orbsvcs/AV/TCP.h" +#include "orbsvcs/AV/RTP.h" +#include "orbsvcs/AV/RTCP.h" +#include "orbsvcs/AV/sfp.h" +#include "orbsvcs/AV/default_resource.h" #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) -#include "orbsvcs/orbsvcs/AV/QoS_UDP.h" +#include "orbsvcs/AV/QoS_UDP.h" #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ #if defined (ACE_HAS_SCTP) -#include "orbsvcs/orbsvcs/AV/SCTP_SEQ.h" +#include "orbsvcs/AV/SCTP_SEQ.h" #endif // ACE_HAS_SCTP #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h index 1cc2e78de16..d6ac2037153 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -15,8 +15,8 @@ #include /**/ "ace/pre.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/orbsvcs/AVStreamsC.h" -#include "orbsvcs/orbsvcs/AV/AV_export.h" +#include "orbsvcs/AVStreamsC.h" +#include "orbsvcs/AV/AV_export.h" #include "ace/Singleton.h" #include "ace/Unbounded_Set.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h index 8abf7e851f4..e171286341a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h @@ -16,7 +16,7 @@ #define TAO_AV_FLOWSPEC_ENTRY_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/AV/AV_export.h" +#include "orbsvcs/AV/AV_export.h" #include "AV_Core.h" #include "ace/Addr.h" #include "ace/Containers.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h index b26ef80acfb..24fd3082914 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h @@ -18,7 +18,7 @@ #include "ace/Addr.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/AV/AV_export.h" +#include "orbsvcs/AV/AV_export.h" struct TAO_AV_frame_info { diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index cdc48d2316a..b4420b21ee5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -6,12 +6,12 @@ #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) #include "UDP.h" -#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/MCast.h" -#include "orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/AV/Fill_ACE_QoS.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/AV/QoS_UDP.i" +#include "orbsvcs/AV/QoS_UDP.i" #endif /* __ACE_INLINE__ */ //------------------------------------------------------------ diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h index 702fc27aa90..ebc49bc6147 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h @@ -29,7 +29,7 @@ #include "ace/QoS/QoS_Decorator.h" #include "ace/QoS/SOCK_Dgram_Mcast_QoS.h" -#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/AV/Protocol_Factory.h" class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h index 4465ae7cf25..38555b63efd 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h @@ -51,11 +51,11 @@ // FUZZ: disable check_for_math_include #include "ace/OS.h" #include "ace/Hash_Map_Manager.h" -#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/UDP.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/UDP.h" #include <math.h> #include <stdlib.h> -#include "orbsvcs/orbsvcs/AV/RTP.h" +#include "orbsvcs/AV/RTP.h" #include "RTCP_Channel.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h index a6ef7fef8ed..1af28588edd 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h @@ -50,8 +50,8 @@ #define TAO_AV_RTP_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/AV/AV_export.h" -#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/AV/AV_export.h" +#include "orbsvcs/AV/Protocol_Factory.h" #define RTP_PT_BVC 22 /* Berkeley video codec */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h index d38e975de83..aa50d43203d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h @@ -12,7 +12,7 @@ #define TAO_AV_DEFAULT_RESOURCE_FCATORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/AVStreams_i.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h index 8ca19263633..8de06427317 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.h +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h @@ -22,7 +22,7 @@ #include "ace/Connector.h" #include "ace/Addr.h" #include "ace/SOCK_Dgram.h" -#include "orbsvcs/orbsvcs/AV/AV_export.h" +#include "orbsvcs/AV/AV_export.h" #include "FlowSpec_Entry.h" #include "AV_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp index 4c8b45256dc..e29c8e154ce 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/AV/default_resource.h" +#include "orbsvcs/AV/default_resource.h" #include "tao/ORB_Core.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.h b/TAO/orbsvcs/orbsvcs/AV/default_resource.h index 2867e024e28..01420bb907f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.h +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.h @@ -13,8 +13,8 @@ #define TAO_AV_DEFAULT_RESOURCE_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/Resource_Factory.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Resource_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index 70bba33f830..1885a633231 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -14,8 +14,8 @@ #define TAO_AV_SFP_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/AV/AV_export.h" -#include "orbsvcs/orbsvcs/sfpC.h" +#include "orbsvcs/AV/AV_export.h" +#include "orbsvcs/sfpC.h" #include "ace/SOCK_Dgram.h" #include "ace/INET_Addr.h" diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients.h b/TAO/orbsvcs/orbsvcs/Channel_Clients.h index 16b0c45c420..51ee8c8e9ac 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients.h @@ -18,7 +18,7 @@ #define ACE_CHANNEL_CLIENTS_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/Channel_Clients_T.h" #include /**/ "ace/post.h" #endif /* ACE_CHANNEL_CLIENTS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp index 695611bf0c5..a8a79821a67 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp @@ -3,14 +3,14 @@ #ifndef ACE_CHANNEL_CLIENTS_T_C #define ACE_CHANNEL_CLIENTS_T_C -#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/Channel_Clients_T.h" ACE_RCSID (orbsvcs, Channel_Clients_T, "$Id$") #if !defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Channel_Clients_T.i" +#include "orbsvcs/Channel_Clients_T.i" #endif /* __ACE_INLINE__ */ template<class TARGET> void diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h index 472a73753f9..f81af14d074 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h @@ -25,7 +25,7 @@ #define ACE_CHANNEL_CLIENTS_T_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventCommS.h" // @@ TODO: Add throw specs to this classes. @@ -83,11 +83,11 @@ private: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Channel_Clients_T.i" +#include "orbsvcs/Channel_Clients_T.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/orbsvcs/Channel_Clients_T.cpp" +#include "orbsvcs/Channel_Clients_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h index f84ffd871dd..668ee73708b 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/CosConcurrencyControlC.h" #include "concurrency_export.h" /// This constant defines the number of lock modes. There is really no diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h index 12da31cc6df..75bb4e1a88f 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -44,7 +44,7 @@ #include "ace/Token.h" #include "ace/Unbounded_Queue.h" -#include "orbsvcs/orbsvcs/CosConcurrencyControlS.h" +#include "orbsvcs/CosConcurrencyControlS.h" #include "concurrency_export.h" #if defined (lock_held) diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h index 8e052406c9f..b49944528d8 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosConcurrencyControlS.h" +#include "orbsvcs/CosConcurrencyControlS.h" #include "concurrency_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h index bdeee1f5775..30f680393cb 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h" +#include "orbsvcs/Concurrency/Concurrency_Utils.h" class TAO_Concurrency_Export TAO_Concurrency_Loader : public TAO_Object_Loader { diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp index 88f46386065..5aaa4d8d70b 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -11,7 +11,7 @@ #include "ace/streams.h" -#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/CosConcurrencyControlC.h" #include "tao/debug.h" #include "Concurrency_Utils.h" diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h index b343cd6f61c..ac92e019ecb 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h @@ -22,7 +22,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/CosConcurrencyControlC.h" #include "CC_LockSetFactory.h" #include "concurrency_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index c1044726527..faa5d2b9ac0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -6,7 +6,7 @@ #include "CEC_ProxyPushConsumer.h" #include "CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "CEC_ConsumerAdmin.i" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index a56cbbed72f..0df20092960 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h" +#include "orbsvcs/ESF/ESF_Proxy_Admin.h" #include "CEC_ProxyPushSupplier.h" #include "CEC_ProxyPullSupplier.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index 07293872b3f..3757c04a6f6 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -22,7 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosEvent/event_export.h" +#include "orbsvcs/CosEvent/event_export.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushSupplier; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index 58f079b3cd9..87fff75616e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -13,12 +13,12 @@ #include "CEC_Reactive_ConsumerControl.h" #include "CEC_Reactive_SupplierControl.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h" +#include "orbsvcs/ESF/ESF_Immediate_Changes.h" +#include "orbsvcs/ESF/ESF_Delayed_Changes.h" +#include "orbsvcs/ESF/ESF_Copy_On_Write.h" +#include "orbsvcs/ESF/ESF_Copy_On_Read.h" +#include "orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h" #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index b121b22e54d..1efbdfb9695 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEventCommC.h" +#include "orbsvcs/CosEventCommC.h" #include "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index ac24df18469..138e22d052f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -28,7 +28,7 @@ #include "tao/Basic_Types.h" #include "tao/Objref_VarOut_T.h" -#include "orbsvcs/orbsvcs/CosEvent/event_export.h" +#include "orbsvcs/CosEvent/event_export.h" #include "CEC_ProxyPushSupplier.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index 90c4e9cd216..bf876824fc0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "CEC_Defaults.h" #include "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index a7f8408d45f..1e6e01dc679 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -18,9 +18,9 @@ #include "CEC_Event_Loader.h" #include "ace/Dynamic_Service.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index 4d4ca86a992..9c5e6aae45a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -23,7 +23,7 @@ #include "CEC_TypedEventChannel.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/Service_Config.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 415ae07b47e..30e6d89e8f1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "event_export.h" class TAO_CEC_EventChannel; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 85922eb8922..e2e399a2aa4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index aee97b6f167..fbe592a3bc4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -15,14 +15,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "event_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" class TAO_CEC_EventChannel; class TAO_CEC_Dispatching; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index 2deb6110383..7e93085cc0d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -10,8 +10,8 @@ #include "CEC_Dispatching.h" #include "CEC_EventChannel.h" #include "CEC_ConsumerControl.h" -#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" +#include "orbsvcs/ESF/ESF_RefCount_Guard.h" +#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" #include "tao/debug.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) #include "CEC_TypedEvent.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index d87dd7977dd..48357020537 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -16,10 +16,10 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/CosTypedEventChannelAdminS.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ #include "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h index f1811d51f40..9668fb7418a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -23,7 +23,7 @@ #include "tao/Objref_VarOut_T.h" -#include "orbsvcs/orbsvcs/CosEvent/event_export.h" +#include "orbsvcs/CosEvent/event_export.h" /** * @class TAO_CEC_Pulling_Strategy diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index 164e7588496..8570cfd141e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -21,7 +21,7 @@ #include "CEC_ConsumerControl.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h index cf38a4aa8b9..5698aa484ef 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index 1aefc64bb71..89c1c38b0ab 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index 1335ad5b02e..a2837a9b7eb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -4,7 +4,7 @@ #include "CEC_ProxyPushConsumer.h" #include "CEC_ProxyPullConsumer.h" #include "CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "CEC_SupplierAdmin.i" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index 2fdab582804..e78cd342550 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -19,13 +19,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h" +#include "orbsvcs/ESF/ESF_Proxy_Admin.h" #include "CEC_ProxyPushConsumer.h" #include "CEC_ProxyPullConsumer.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index b65cfc52350..aeea63ca208 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -28,7 +28,7 @@ #include "tao/Objref_VarOut_T.h" -#include "orbsvcs/orbsvcs/CosEvent/event_export.h" +#include "orbsvcs/CosEvent/event_export.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushConsumer; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index 9dce04452c9..aaa087d19a9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/CosTypedEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h" +#include "orbsvcs/ESF/ESF_Proxy_Admin.h" #include "CEC_ProxyPushSupplier.h" #include "CEC_TypedEvent.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index 6db51475183..64bcbbb9c6b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -25,7 +25,7 @@ #include "CEC_Defaults.h" #include "event_export.h" -#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/CosTypedEventChannelAdminS.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/NVList.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index 3ae216f6a4b..4ee4b165b65 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -16,13 +16,13 @@ #define TAO_CEC_TYPEDPROXYPUSHCONSUMER_H_ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/CosTypedEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" class TAO_CEC_TypedEvent; class TAO_CEC_TypedEventChannel; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h index 7f0d3002bc8..9d55ac7dd1c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h @@ -19,13 +19,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/CosTypedEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h" +#include "orbsvcs/ESF/ESF_Proxy_Admin.h" #include "CEC_TypedProxyPushConsumer.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp index 6c49661a2b5..0e781c19364 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp @@ -1,8 +1,8 @@ // $Id$ #include "ace/Sched_Params.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Time_Utilities.h" #include "Memory_Pools.h" #include "Dispatching_Modules.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h index 459feed2c99..03869de539b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h @@ -23,9 +23,9 @@ #include "ace/Reactor_Notification_Strategy.h" #include "tao/Timeprobe.h" -#include "orbsvcs/orbsvcs/Event/ReactorTask.h" -#include "orbsvcs/orbsvcs/Event/Event_Manip.h" -#include "orbsvcs/orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/Event/ReactorTask.h" +#include "orbsvcs/Event/Event_Manip.h" +#include "orbsvcs/Event/Event_Channel.h" // ************************************************************ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h index cc1ae3e6bd7..6a3a4298e83 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" #include /**/ "event_export.h" -#include "orbsvcs/orbsvcs/RtecUDPAdminC.h" +#include "orbsvcs/RtecUDPAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h index eb356e86e3c..533e6ba7391 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" #include /**/ "event_export.h" -#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/RtecUDPAdminS.h" #include "EC_Lifetime_Utils.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h index ee28910bbf3..f8441511cf4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h @@ -16,7 +16,7 @@ #include /**/ "event_export.h" -#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/RtecUDPAdminS.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/INET_Addr.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 80f6a1cd40f..5c52c8e7b3c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h" -#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/Event/ECG_Mcast_EH.h" +#include "orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" #include "ace/Unbounded_Set.h" #include "ace/OS_NS_string.h" #include "ace/Reactor.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index f62de40073a..25f55f68033 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -26,7 +26,7 @@ #include "ace/Array_Base.h" #include "ace/SOCK_Dgram_Mcast.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventChannelAdminS.h" #include /**/ "event_export.h" #include "ECG_Adapters.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index d76f722ade2..773e41b0041 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -9,7 +9,7 @@ #include "ECG_Mcast_EH.h" #include "ECG_UDP_EH.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event_Utilities.h" #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h index b71c9fbe8bf..502b3a555d9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h @@ -12,7 +12,7 @@ #define TAO_ECG_SIMPLE_ADDRESS_SERVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/RtecUDPAdminS.h" #include "EC_Lifetime_Utils_T.h" #include "ace/INET_Addr.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index 075682e983e..0fdccc40c53 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/Event_Utilities.h" #include "ace/SString.h" #if !defined(__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 8e142825d7a..68090d4b7aa 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -37,13 +37,13 @@ #define TAO_ECG_UDP_RECEIVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/RtecUDPAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventChannelAdminS.h" #include /**/ "event_export.h" #include "ECG_Adapters.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index d25efcb56ca..d111b4d8470 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -9,8 +9,8 @@ * */ -#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event/ECG_UDP_Sender.h" +#include "orbsvcs/Event_Utilities.h" #include "tao/CDR.h" #if !defined(__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index ee872d01530..00b1a6181b2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -38,14 +38,14 @@ #define TAO_ECG_UDP_SENDER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/RtecUDPAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ "event_export.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventChannelAdminS.h" #include "EC_Lifetime_Utils.h" #include "EC_Lifetime_Utils_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index 6bfc17ea60f..7eb7b9fac4f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -15,8 +15,8 @@ #include "EC_Reactive_SupplierControl.h" #include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h" +#include "orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/ESF/ESF_Delayed_Changes.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index 193b672ec46..b1b7b1ca222 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" #include "EC_Basic_Filter_Builder.h" #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index 1b846220c81..d27e7203e8a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -4,9 +4,9 @@ #include "EC_ProxySupplier.h" #include "EC_ProxyConsumer.h" #include "EC_Event_Channel_Base.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/ESF/ESF_Peer_Workers.h" +#include "orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "EC_ConsumerAdmin.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h index 909dad88229..60b5edadb24 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/ESF/ESF_Peer_Admin.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index 9d33bbecd68..61adaf515d7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -19,13 +19,13 @@ #include "EC_Reactive_ConsumerControl.h" #include "EC_Reactive_SupplierControl.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h" +#include "orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h" +#include "orbsvcs/ESF/ESF_Immediate_Changes.h" +#include "orbsvcs/ESF/ESF_Copy_On_Read.h" +#include "orbsvcs/ESF/ESF_Copy_On_Write.h" +#include "orbsvcs/ESF/ESF_Delayed_Changes.h" +#include "orbsvcs/ESF/ESF_Delayed_Command.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h index a14c68925e1..853b7e04a93 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h index d028e06a00d..dfbe23bfd05 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h index bae7d4eb094..54ea96405e4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventCommC.h" +#include "orbsvcs/RtecEventCommC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index 067e33340cf..113c5a7b1ad 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RtecEventCommC.h" +#include "orbsvcs/RtecEventCommC.h" #include /**/ "event_export.h" #include "ace/Task.h" #include "ace/Message_Block.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h index dd0799e5752..44d548e8693 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h @@ -27,7 +27,7 @@ #include "EC_Defaults.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventChannelAdminS.h" template<class> class TAO_ESF_Worker; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h index 123a78382a0..ac2f8c4988c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventCommC.h" +#include "orbsvcs/RtecEventCommC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h index be40d293ce0..33c8c9cfb7a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp index a97cd55b4ce..8ef8d8c7ef0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/EC_Gateway.h" +#include "orbsvcs/Event/EC_Gateway.h" ACE_RCSID (Event, EC_Gateway, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h index a8863961edb..ff55b4ca46f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h @@ -19,8 +19,8 @@ #include /**/ "event_export.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventCommS.h" /** * @class TAO_EC_Gateway diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index 6202e72db2c..91e25f95e96 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h" -#include "orbsvcs/orbsvcs/Event/ECG_Defaults.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "orbsvcs/Event/ECG_Defaults.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "EC_Gateway_IIOP_Factory.h" #include "ECG_ConsumerEC_Control.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h index 058fc1b4696..06f2d805dfa 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h @@ -22,9 +22,9 @@ #include /**/ "event_export.h" #include "EC_Gateway.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/Channel_Clients.h" +#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/Channel_Clients.h" #include "ace/Map_Manager.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index 8e4347a7bc7..eb368de2dbb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h" -#include "orbsvcs/orbsvcs/Event/ECG_Defaults.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h" +#include "orbsvcs/Event/ECG_Defaults.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp index 80835d4dde4..cb8453bdef8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -1,7 +1,7 @@ // $Id$ #include "EC_Gateway_Sched.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" ACE_RCSID (Event, EC_Gateway_sched, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h index c207596ae00..3ab5e935271 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" #include "EC_Gateway_IIOP.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerC.h" #include "sched_event_export.h" // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index b1a36867648..2ad2a374996 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -5,8 +5,8 @@ #include "EC_ProxySupplier.h" #include "EC_QOS_Info.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecSchedulerC.h" #include "tao/ORB_Constants.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h index abd145b2b3f..ec54bc03226 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerC.h" #include "rtkokyu_event_export.h" #include "ace/Thread_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp index 0dc7d4e18a0..a40af3f6c2a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -5,7 +5,7 @@ #include "EC_Kokyu_Scheduling.h" #include "EC_Kokyu_Filter_Builder.h" #include "EC_Event_Channel_Base.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerC.h" #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h index 5c1cd2b04d7..55d64cdb2c9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerC.h" #include "rtkokyu_event_export.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp index fd9ebe4715b..5fce1a7cab8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp @@ -1,7 +1,7 @@ // $Id$ #include "EC_Kokyu_Filter.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" #include "EC_Kokyu_Filter_Builder.h" #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h index f07a37c374c..5eb6ef5dc35 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerC.h" #include "rtkokyu_event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h index 39c2d42020b..8efb85c2d98 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" #include /**/ "event_export.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #include "tao/PortableServer/PortableServerC.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index 841bd6656c7..e9df4b4298e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp @@ -14,8 +14,8 @@ #include "EC_ConsumerControl.h" #include "EC_SupplierControl.h" #include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h" +#include "orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/ESF/ESF_Immediate_Changes.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 6b0af4e85dd..3149420a6f1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -6,7 +6,7 @@ #include "EC_ProxyConsumer.h" #include "EC_ConsumerAdmin.h" #include "EC_SupplierAdmin.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" #include "ace/Auto_Ptr.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h index 6d33cfea8c6..5bca0bf2172 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ #include "ace/RB_Tree.h" #include "ace/Map_Manager.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index e0add81915f..1eb2794a909 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -7,9 +7,9 @@ #include "EC_Scheduling_Strategy.h" #include "EC_QOS_Info.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) #include "EC_Per_Supplier_Filter.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index 8a3879662f4..ed97744f809 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" #include "EC_Prefix_Filter_Builder.h" #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index ade0f194676..53f7634ce00 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -5,8 +5,8 @@ #include "EC_Event_Channel_Base.h" #include "EC_QOS_Info.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecSchedulerC.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h index b8156a664e1..717fad35865 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerC.h" #include "sched_event_export.h" #include "ace/Thread_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h index 45bed1bbf9c..a8a1fee8960 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerC.h" #include "sched_event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index 82a0162f440..75718ee9895 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -19,7 +19,7 @@ #include /**/ "event_export.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index 00d0b81e4a6..ea22992bf90 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -8,8 +8,8 @@ #include "EC_Scheduling_Strategy.h" #include "EC_ConsumerControl.h" #include "EC_SupplierAdmin.h" -#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" +#include "orbsvcs/ESF/ESF_RefCount_Guard.h" +#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" #include "ace/Reverse_Lock_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index 590d5c61190..552383c96d9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventChannelAdminS.h" #include "EC_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h index 559b3497f8b..dce214ba29d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h @@ -9,7 +9,7 @@ #define EC_PROXY_DISCONNECTOR__H_ #include /**/ "event_export.h" -#include "orbsvcs/orbsvcs/RtecEventCommC.h" +#include "orbsvcs/RtecEventCommC.h" #include "ace/Auto_Functor.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h index 25a37802392..0fbc4fe9290 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecBaseC.h" +#include "orbsvcs/RtecBaseC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h index 06929bcf071..a470864444f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h index f1885974944..c08e3d05705 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h @@ -19,7 +19,7 @@ #include "EC_SupplierControl.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index 92a0da41ec3..0199dec1957 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -5,7 +5,7 @@ #include "EC_Priority_Scheduling.h" #include "EC_Sched_Filter_Builder.h" #include "EC_Event_Channel_Base.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerC.h" #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h index f556b0f1d8b..c1093401be5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerC.h" #include "sched_event_export.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 5e153f1bcb1..6b2815e4897 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -1,7 +1,7 @@ // $Id$ #include "EC_Sched_Filter.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" #include "EC_Sched_Filter_Builder.h" #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h index b89992dcba1..29c94f4f892 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h @@ -19,8 +19,8 @@ #include /**/ "event_export.h" -#include "orbsvcs/orbsvcs/RtecBaseC.h" -#include "orbsvcs/orbsvcs/RtecEventCommC.h" +#include "orbsvcs/RtecBaseC.h" +#include "orbsvcs/RtecEventCommC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index 585fd0076e3..39d04fec297 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -4,9 +4,9 @@ #include "EC_ProxyConsumer.h" #include "EC_ProxySupplier.h" #include "EC_Event_Channel_Base.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/ESF/ESF_Peer_Workers.h" +#include "orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "EC_SupplierAdmin.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h index 47956d2f32c..91572785bc2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/ESF/ESF_Peer_Admin.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h index 0d80ad03c9e..b4318075078 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h @@ -17,8 +17,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventCommC.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h index 534752a9eaf..88a25804797 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index dba117af1c6..e4e812f95b9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -4,8 +4,8 @@ #include "EC_Timeout_Generator.h" #include "EC_Event_Channel_Base.h" #include "EC_ProxySupplier.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) #include "EC_Timeout_Filter.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index fdbe46377ab..4373aef1b62 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -2,7 +2,7 @@ #include "EC_Timeout_Generator.h" #include "EC_Timeout_Filter.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) #include "EC_Timeout_Generator.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index f037d3df588..37374a6f760 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/EC_UDP_Admin.h" +#include "orbsvcs/Event/EC_UDP_Admin.h" ACE_RCSID (Event, EC_UDP_Admin, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h index 89588a49864..5cccfec538c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h @@ -16,7 +16,7 @@ #define TAO_EC_UDP_ADMIN_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/RtecUDPAdminS.h" #include /**/ "event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp index 9360d98f57e..65bbe15ddd5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp @@ -2,15 +2,15 @@ #include "ace/Service_Config.h" #include "ace/Auto_Ptr.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" - -#include "orbsvcs/orbsvcs/Event/Dispatching_Modules.h" -#include "orbsvcs/orbsvcs/Event/Memory_Pools.h" -#include "orbsvcs/orbsvcs/Event/EC_Gateway.h" -#include "orbsvcs/orbsvcs/Event/Module_Factory.h" -#include "orbsvcs/orbsvcs/Event/Event_Manip.h" -#include "orbsvcs/orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Event_Utilities.h" + +#include "orbsvcs/Event/Dispatching_Modules.h" +#include "orbsvcs/Event/Memory_Pools.h" +#include "orbsvcs/Event/EC_Gateway.h" +#include "orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/Event/Event_Manip.h" +#include "orbsvcs/Event/Event_Channel.h" #if !defined (__ACE_INLINE__) #include "Event_Channel.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h index a6c4709a9c9..30e0d418536 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h @@ -40,11 +40,11 @@ #include "tao/Timeprobe.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/orbsvcs/Event/Local_ESTypes.h" -#include "orbsvcs/orbsvcs/Event/Timer_Module.h" -#include "orbsvcs/orbsvcs/Event/ReactorTask.h" -#include "orbsvcs/orbsvcs/Event/Event_Manip.h" +#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Event/Local_ESTypes.h" +#include "orbsvcs/Event/Timer_Module.h" +#include "orbsvcs/Event/ReactorTask.h" +#include "orbsvcs/Event/Event_Manip.h" // ************************************************************ diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp index de495fe73e4..0d8e97cb479 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp @@ -8,7 +8,7 @@ // // ============================================================================ -#include "orbsvcs/orbsvcs/Event/Event_Manip.h" +#include "orbsvcs/Event/Event_Manip.h" #if !defined (__ACE_INLINE__) #include "Event_Manip.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h index b087dc2ce4a..b78511867b5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h @@ -21,7 +21,7 @@ #define TAO_EC_EVENT_MANIP_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventCommC.h" +#include "orbsvcs/RtecEventCommC.h" #include "old_event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h index a7490392d68..46252134318 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h +++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h @@ -22,15 +22,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" - -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/orbsvcs/RtecEventCommC.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/Event_Service_Constants.h" + +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventChannelAdminS.h" #define ACE_DEFAULT_EVENT_CHANNEL_TYPE 0 diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp index b35af5eb52f..282d4786003 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/Dispatching_Modules.h" -#include "orbsvcs/orbsvcs/Event/Timer_Module.h" -#include "orbsvcs/orbsvcs/Event/Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/Event/Dispatching_Modules.h" +#include "orbsvcs/Event/Timer_Module.h" +#include "orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/Event/Module_Factory.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp index cc9677c430c..951a933d70f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Sched_Params.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Scheduler_Factory.h" #include "RT_Task.h" #include "Debug_Macros.h" #include "Event_Channel.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h index 9cbf1d10a7e..6bb34db4910 100644 --- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerC.h" #include "old_event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp index ca449ff4800..92451aa9c6e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp @@ -2,7 +2,7 @@ #include "ace/High_Res_Timer.h" #include "tao/Timeprobe.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Scheduler_Factory.h" #include "ReactorTask.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp index de8d73e8625..6416bfa411e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp @@ -2,7 +2,7 @@ #include "ace/Functor.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Scheduler_Factory.h" #include "ReactorTask.h" #include "Timer_Module.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h index e28f0cc74ea..2b93e920c66 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h +++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h @@ -13,8 +13,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/Event/RT_Task.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event/RT_Task.h" class ACE_Command_Base; diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h index 2c97ce537d8..075adda129a 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h +++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" /// This is the number of events a consumer can subscribe to. const int ACE_ES_MAX_SUBSCRIPTIONS = 32; diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp index 29b41b32d45..3d45c411eaf 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event_Utilities.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Event_Utilities.i" +#include "orbsvcs/Event_Utilities.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (orbsvcs, diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h index 30d432cbdf9..9bc493d5ea3 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h @@ -16,8 +16,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Event_Service_Constants.h" #include "Event/event_export.h" @@ -244,7 +244,7 @@ private: #if defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Event_Utilities.i" +#include "orbsvcs/Event_Utilities.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl b/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl index fd253ce9fec..3290d1f2225 100644 --- a/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl +++ b/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl @@ -13,9 +13,9 @@ #ifndef TAO_FTRT_GROUPMANAGER_IDL #define TAO_FTRT_GROUPMANAGER_IDL -#include "orbsvcs/orbsvcs/RtecEventChannelAdmin.idl" +#include "orbsvcs/RtecEventChannelAdmin.idl" #include "orb.idl" -#include "orbsvcs/orbsvcs/CosNaming.idl" +#include "orbsvcs/CosNaming.idl" #include "FTRT.idl" module FTRT diff --git a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl index 64c0009937c..e9529e48959 100644 --- a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl +++ b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl @@ -11,18 +11,18 @@ // FT_Replica.idl // The next include is TAO specific. -#include "orbsvcs/orbsvcs/FT_CORBA_ORB.idl" +#include "orbsvcs/FT_CORBA_ORB.idl" #define FT_USES_PORTABLE_GROUP #ifdef FT_USES_PORTABLE_GROUP # include "orbsvcs/orbsvcs/PortableGroup.idl" #else // FT_USES_PORTABLE_GROUP -#include "orbsvcs/orbsvcs/CosNaming.idl" // 98-10-19.idl +#include "orbsvcs/CosNaming.idl" // 98-10-19.idl #endif // FT_USES_PORTABLE_GROUP -#include "orbsvcs/orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl -#include "orbsvcs/orbsvcs/CosNotifyFilter.idl" +#include "orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl +#include "orbsvcs/CosNotifyFilter.idl" #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl b/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl index 194b6183e5f..b783eb46ace 100644 --- a/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl +++ b/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl @@ -22,9 +22,9 @@ #pragma prefix "omg.org" -#include "orbsvcs/orbsvcs/FT_CORBA.idl" -#include "orbsvcs/orbsvcs/FT_Replica.idl" -#include "orbsvcs/orbsvcs/PortableGroup.idl" +#include "orbsvcs/FT_CORBA.idl" +#include "orbsvcs/FT_Replica.idl" +#include "orbsvcs/PortableGroup.idl" module FT { diff --git a/TAO/orbsvcs/orbsvcs/FT_Notifier.idl b/TAO/orbsvcs/orbsvcs/FT_Notifier.idl index de0e071b58a..bb1d839f388 100644 --- a/TAO/orbsvcs/orbsvcs/FT_Notifier.idl +++ b/TAO/orbsvcs/orbsvcs/FT_Notifier.idl @@ -17,16 +17,16 @@ /////////////////////////////// // TAO specific includes -#include "orbsvcs/orbsvcs/FT_CORBA_ORB.idl" -#include "orbsvcs/orbsvcs/FT_Replica.idl" +#include "orbsvcs/FT_CORBA_ORB.idl" +#include "orbsvcs/FT_Replica.idl" // end of TAO specific includes /////////////////////////////// -#include "orbsvcs/orbsvcs/CosNaming.idl" // 98-10-19.idl -#include "orbsvcs/orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl +#include "orbsvcs/CosNaming.idl" // 98-10-19.idl +#include "orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl // added to OMG version: -#include "orbsvcs/orbsvcs/CosNotifyFilter.idl" +#include "orbsvcs/CosNotifyFilter.idl" #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl b/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl index 73d47a48b52..8f36d6b135a 100644 --- a/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl +++ b/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl @@ -15,10 +15,10 @@ #ifndef _FT_REPLICATION_MANAGER_IDL_ #define _FT_REPLICATION_MANAGER_IDL_ -#include "orbsvcs/orbsvcs/PortableGroup.idl" -#include "orbsvcs/orbsvcs/FT_CORBA.idl" -#include "orbsvcs/orbsvcs/FT_Replica.idl" -#include "orbsvcs/orbsvcs/FT_Notifier.idl" +#include "orbsvcs/PortableGroup.idl" +#include "orbsvcs/FT_CORBA.idl" +#include "orbsvcs/FT_Replica.idl" +#include "orbsvcs/FT_Notifier.idl" #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp index a02b8ba4a14..c59cd08d228 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp @@ -5,7 +5,7 @@ #include "FT_ClientORBInitializer.h" #include "FT_ClientPolicyFactory.h" #include "FT_ClientRequest_Interceptor.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/Exception.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp index 1f86d5f03dc..7da3391fdd8 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp @@ -4,7 +4,7 @@ #include "FT_ClientPolicyFactory.h" #include "FT_ClientPolicy_i.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h index 48a3e1bdea8..f9e93824f1c 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h @@ -14,7 +14,7 @@ #define TAO_FT_CLIENTPOLICY_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index e61ed2037e8..719ae0c489d 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -1,7 +1,7 @@ // $Id$ #include "FT_ClientRequest_Interceptor.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/CORBA_String.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h index a80b43b1978..94d4b522b89 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h @@ -24,7 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/IORManipulation/IORManip_Loader.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/IOPC.h" #include "FT_ORB_Utils_export.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp index fd8e7e29908..728f608a449 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp @@ -6,7 +6,7 @@ #include "FT_ServerPolicyFactory.h" #include "FT_ServerRequest_Interceptor.h" #include "tao/ORB_Constants.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/Exception.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp index 126a9b4d1b0..e06536ee5f6 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp @@ -4,7 +4,7 @@ #include "FT_ServerPolicyFactory.h" #include "FT_ServerPolicy_i.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h index 5441291f6fc..c2fcc4cab2a 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h @@ -14,7 +14,7 @@ #define TAO_FT_SERVERPOLICY_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index 95703574f92..07785dbf0f1 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -6,7 +6,7 @@ #include "tao/DynamicC.h" #include "tao/Typecode.h" #include "tao/CDR.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h index 8d6d3873e53..b4f496ea24f 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h @@ -21,7 +21,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Service_Callbacks.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" class TAO_Profile; class TAO_MProfile; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h index d385490ef76..07caec84c43 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h @@ -15,7 +15,7 @@ #include "UpdateableHandler.h" #include "Replication_Strategy.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "ace/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h index 055b3ea22cc..5cb5792d3c1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h @@ -15,7 +15,7 @@ #include "ace/Task.h" #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/orbsvcs/FTRT_GroupManagerC.h" +#include "orbsvcs/FTRT_GroupManagerC.h" #include "Replication_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp index bc27837b85d..fa2c3cf0dbd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "FTEC_ConsumerAdmin.h" #include "FTEC_ProxySupplier.h" #include "ProxySupplierStateWorker.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h index 78cd609596a..267162a8b4b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h @@ -17,7 +17,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" #include "FT_ProxyAdmin_T.h" #include "ProxySupplierStateWorker.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h index 961289f2e6e..ff7d20f47ff 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h @@ -13,7 +13,7 @@ #define FTEC_EVENT_CHANNEL_H #include "ftrtec_export.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminS.h" +#include "orbsvcs/FtRtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index d452581b1bd..5c9c7f79053 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -11,7 +11,7 @@ #include "IOGR_Maker.h" #include "Replication_Service.h" #include "../Utils/Safe_InputCDR.h" -#include "orbsvcs/orbsvcs/FtRtecEventCommC.h" +#include "orbsvcs/FtRtecEventCommC.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h index 2f021715f21..4ddb93d6450 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h @@ -13,8 +13,8 @@ #define TAO_FTEC_EVENT_CHANNEL_H #include "ace/Synch_T.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "FTEC_Factory.h" #include "FTEC_Group_Manager.h" #include "IOGR_Maker.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp index f49851fc591..b46188a9458 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp @@ -1,5 +1,5 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Event_Channel.h" #include "FTEC_Event_Channel.h" #include "FTEC_Factory.h" #include "FTEC_ProxySupplier.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h index f66743e06b8..d253716dba1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h @@ -12,7 +12,7 @@ #ifndef FTEC_FACTORY_H #define FTEC_FACTORY_H -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Default_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h index e41fc061fe2..f2720fa1393 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h @@ -13,7 +13,7 @@ #ifndef TAO_FTEC_GROUP_MANAGER_H #define TAO_FTEC_GROUP_MANAGER_H -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "FTEC_Fault_Listener.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h index 71555d8e463..0522671688a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h @@ -12,9 +12,9 @@ #ifndef TAO_FTEC_PROXYCONSUMER_H #define TAO_FTEC_PROXYCONSUMER_H -#include "orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Default_ProxyConsumer.h" #include "ace/SString.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "Request_Context_Repository.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h index 00214efb221..a1ca15aeaff 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h @@ -12,9 +12,9 @@ #ifndef TAO_FTEC_PROXYSUPPLIER_H #define TAO_FTEC_PROXYSUPPLIER_H -#include "orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h" +#include "orbsvcs/Event/EC_Default_ProxySupplier.h" #include "ace/SString.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "Request_Context_Repository.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp index c78245ef4d0..b67a0fe6a3a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "FTEC_SupplierAdmin.h" #include "FTEC_ProxyConsumer.h" #include "tao/Stub.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h index 86cabee49b7..9bbdca262ed 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/Event/EC_SupplierAdmin.h" class TAO_FTEC_Event_Channel_Impl; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h index a3b2cb066fd..01d02f86e00 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" #include "tao/corba.h" #include "tao/PortableServer/Servant_Base.h" -#include "orbsvcs/orbsvcs/FtRtecEventCommC.h" +#include "orbsvcs/FtRtecEventCommC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h index bdee43cd7a7..10d93e3705d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h @@ -16,7 +16,7 @@ #include "ace/Task.h" #include "ace/Reactor.h" -#include "orbsvcs/orbsvcs/FTRT_GroupManagerC.h" +#include "orbsvcs/FTRT_GroupManagerC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index b0fcba2ef7c..f228a360c5f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -11,7 +11,7 @@ #include "tao/Object_KeyC.h" #include "tao/ORB_Constants.h" -#include "orbsvcs/orbsvcs/FTRTC.h" +#include "orbsvcs/FTRTC.h" ACE_RCSID (EventChannel, ForwardCtrlServerInterceptor, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 3b3a0efc522..ce5ea538e26 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "FtEventServiceInterceptor.h" #include "Request_Context_Repository.h" #include "../Utils/Safe_InputCDR.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h index 2c58dcad192..4607ee70075 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h @@ -16,7 +16,7 @@ #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" #include "tao/ORB.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h index f7eddb4ff98..574a89bf1c8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h @@ -13,7 +13,7 @@ #ifndef GROUPINFOPUBLISHER_H #define GROUPINFOPUBLISHER_H -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "tao/PortableServer/PortableServerC.h" #include "ace/Vector_T.h" #include "ace/Singleton.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index 2b474626ac6..03ff6faf180 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -10,7 +10,7 @@ #include <algorithm> #include "../Utils/resolve_init.h" #include "../Utils/Safe_InputCDR.h" -#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "GroupInfoPublisher.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h index a34c696e523..99619a369d3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h @@ -13,7 +13,7 @@ #ifndef IOGR_MAKER_H #define IOGR_MAKER_H -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/IORManipulation/IORManipulation.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h index d5c4578016e..0fb06766859 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h @@ -14,9 +14,9 @@ #define IDENTIFICATION_SERVICE_H #include "ace/Service_Object.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/FTRTC.h" -#include "orbsvcs/orbsvcs/FtRtecEventCommC.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/FTRTC.h" +#include "orbsvcs/FtRtecEventCommC.h" #include "ftrtec_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h index fce0d28a993..8b5b14f8acd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h @@ -12,7 +12,7 @@ #ifndef OBJECTGROUPMANAGERHANDLER_H #define OBJECTGROUPMANAGERHANDLER_H -#include "orbsvcs/orbsvcs/FTRT_GroupManagerS.h" +#include "orbsvcs/FTRT_GroupManagerS.h" #include "ace/Auto_Event.h" class ObjectGroupManagerHandler : public POA_FTRT::AMI_ObjectGroupManagerHandler diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp index a9c60538ae2..7869ab38378 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp @@ -1,8 +1,8 @@ // $Id$ #include "ProxyConsumerStateWorker.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" ACE_RCSID (EventChannel, ProxyConsumerStateWorker, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h index 1de276bb2c6..772fd16538e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h @@ -13,8 +13,8 @@ #ifndef PROXYCONSUMERSTATEWORKER_H #define PROXYCONSUMERSTATEWORKER_H -#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "FTEC_ProxyConsumer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp index 0a0e2d732a0..cb455699293 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "ProxySupplierStateWorker.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" ACE_RCSID (EventChannel, ProxySupplierStateWorker, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h index 01158edeb08..aa6681719de 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h @@ -13,8 +13,8 @@ #ifndef PROXYSUPPLIERSTATEWORKER_H #define PROXYSUPPLIERSTATEWORKER_H -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "FTEC_ProxySupplier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h index cc204aca9a3..24615e80cc4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h @@ -13,7 +13,7 @@ #ifndef REPLCATION_SERVICE_H #define REPLCATION_SERVICE_H -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "FTEC_Become_Primary_Listener.h" #include "tao/PortableInterceptorC.h" #include "ace/Service_Object.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h index 40a4eee3bc5..7ed955e2d11 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h @@ -12,7 +12,7 @@ #ifndef REPLICATION_STRATEGY_H #define REPLICATION_STRATEGY_H -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "tao/PortableInterceptorC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h index f8aa835afa9..158b43ea297 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h @@ -13,7 +13,7 @@ #ifndef REQUEST_CONTEXT_REPOSITORY_H #define REQUEST_CONTEXT_REPOSITORY_H -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "tao/PortableInterceptorC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp index 0fd88f14e61..1a890399027 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -2,7 +2,7 @@ #include "tao/CDR.h" #include "Set_Update_Interceptor.h" -#include "orbsvcs/orbsvcs/FTRTC.h" +#include "orbsvcs/FTRTC.h" #include "Request_Context_Repository.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h index 07f61e9e461..a1ba493264f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h @@ -12,7 +12,7 @@ #ifndef UPDATEABLEHANDLER_H #define UPDATEABLEHANDLER_H -#include "orbsvcs/orbsvcs/FTRTS.h" +#include "orbsvcs/FTRTS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index 38c23229766..f68d1cdcde8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -2,7 +2,7 @@ #include "activate_with_id.h" #include "UUID.h" #include "resolve_init.h" -#include "orbsvcs/orbsvcs/FtRtecEventCommS.h" +#include "orbsvcs/FtRtecEventCommS.h" #include "tao/ORB_Core.h" ACE_RCSID (Utils, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h index bc4a9139dfc..9cafa79f8f8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h @@ -13,8 +13,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventChannelAdminS.h" namespace TAO_FTRTEC { diff --git a/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl index 234f59d2480..866640ef114 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl +++ b/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl @@ -13,7 +13,7 @@ #ifndef TAO_FTRTEC_EVENTCHANNELADMIN_IDL #define TAO_FTRTEC_EVENTCHANNELADMIN_IDL -#include "orbsvcs/orbsvcs/RtecEventChannelAdmin.idl" +#include "orbsvcs/RtecEventChannelAdmin.idl" #include "FTRT.idl" #include "FTRT_GroupManager.idl" #include "FtRtecEventComm.idl" diff --git a/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl b/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl index 6d44c9ba90b..a1406158952 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl +++ b/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl @@ -13,7 +13,7 @@ #ifndef FTRTECEVNETCOMM_H #define FTRTECEVNETCOMM_H -#include "orbsvcs/orbsvcs/RtecEventComm.idl" +#include "orbsvcs/RtecEventComm.idl" module FtRtecEventComm { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index f4aa04e4953..9d87b2abbd3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -4,10 +4,10 @@ #include "IDLType_i.h" #include "Container_i.h" #include "Contained_i.h" -#include "orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h" -#include "orbsvcs/orbsvcs/IFRService/Options.h" -#include "orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h" -#include "orbsvcs/orbsvcs/IOR_Multicast.h" +#include "orbsvcs/IFRService/ComponentRepository_i.h" +#include "orbsvcs/IFRService/Options.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" +#include "orbsvcs/IOR_Multicast.h" #include "tao/IORTable/IORTable.h" #include "tao/ORB_Core.h" #include "tao/default_ports.h" diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h index 9d26c3665cb..863106d7487 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h @@ -23,7 +23,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/svc_utils_export.h" +#include "orbsvcs/svc_utils_export.h" #include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h index d680e65932a..ce0e3b6e62c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h index fab93d1af5f..6ad66ee8ada 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h @@ -17,13 +17,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h index 224294591bc..4d960d74884 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/LB_ORTC.h" +#include "orbsvcs/LB_ORTC.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp index 374198c8aac..fd3240d0bcd 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp @@ -1,6 +1,6 @@ #include "LB_ClientRequestInterceptor.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" ACE_RCSID (LoadBalancing, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h index 166d3037734..0f290d8412b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/LB_ORTC.h" +#include "orbsvcs/LB_ORTC.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h index 537a3dcbdaf..7252318027a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #include "tao/LocalObject.h" #include "tao/IORInterceptor/IORInterceptorC.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 97b11bfb4df..11c0c402b90 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -2,7 +2,7 @@ #include "LB_LoadMap.h" #include "LB_Random.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index 0ae1886cd3b..478b6d22b63 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -22,7 +22,7 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h index bec59e2725f..5c356ef3b41 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" class TAO_LoadBalancing_Export TAO_LB_LoadAlert diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp index 8b4effbc06d..78eeeb187f6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp @@ -1,5 +1,5 @@ #include "LB_LoadAlertInfo.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h" +#include "orbsvcs/PortableGroup/PG_Operators.h" ACE_RCSID (LoadBalancing, LB_LoadAlertInfo, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h index 069c924c021..6736448e92c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h index de57de3dc2a..620ec2d3acb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h @@ -24,8 +24,8 @@ #include "LB_LoadAlertInfo.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h index 00ca3154c3d..0768f411ac2 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h @@ -13,7 +13,7 @@ #ifndef TAO_LB_LOAD_ALERT_REPLY_HANDLER_H #define TAO_LB_LOAD_ALERT_REPLY_HANDLER_H -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index d6da83152c8..a9865acf8b7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -2,7 +2,7 @@ #include "LB_LoadMap.h" #include "LB_Random.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h index 8f50a617e19..fc69de65e4a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h @@ -23,7 +23,7 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h index 1ca35de22bf..ebfbb3b6cb7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h @@ -16,16 +16,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index e70d2ef5c7c..32d63b54f0f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -8,8 +8,8 @@ #include "LB_LeastLoaded.h" #include "LB_conf.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "orbsvcs/PortableGroup/PG_conf.h" #include "tao/Messaging/Messaging.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h index fc9477c0cb2..06b190c4e4b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -28,11 +28,11 @@ #include "LB_LoadListMap.h" #include "LB_Pull_Handler.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h" +#include "orbsvcs/PortableGroup/PG_PropertyManager.h" +#include "orbsvcs/PortableGroup/PG_GenericFactory.h" +#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" class TAO_LoadBalancing_Export TAO_LB_LoadManager diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h index 1ff00d58bc6..6e5778f4a55 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h @@ -16,16 +16,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index a247293b071..8f0cc83f219 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -3,7 +3,7 @@ #include "LB_LoadMap.h" #include "LB_Random.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h index 1587d889b3f..522d574ea3c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h @@ -23,7 +23,7 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h index 9bda59cc806..b99c5437779 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "ace/Functor.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h index 46dd23539e5..02b8f12adeb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h @@ -16,14 +16,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp index 9f59c099b0f..245fc0552b1 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp @@ -2,7 +2,7 @@ #include "LB_IORInterceptor.h" #include "LB_ServerRequestInterceptor.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h index 6ca2b5b8597..d7bab7a8e98 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/LB_ORTC.h" +#include "orbsvcs/LB_ORTC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,7 +28,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #include "ace/Array_Base.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h index 7eb9eb88c72..2f03027c78a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp index 82e408654ff..6e8c1db4288 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp @@ -2,7 +2,7 @@ #include "LB_RoundRobin.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h index 934e92a7d1c..c244a697157 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h @@ -22,9 +22,9 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h" +#include "orbsvcs/LoadBalancing/LB_Location_Index_Map.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" /** * @class TAO_LB_RoundRobin_Strategy diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h index 4a7d114122e..a03a561f291 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h @@ -18,7 +18,7 @@ #include "ace/config-all.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp index 9d6f39e6fb5..2a96caf9700 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/orbsvcs/Log/BasicLogFactory_i.h" +#include "orbsvcs/Log/BasicLogFactory_i.h" ACE_RCSID (Log, BasicLogFactory_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h index bc0f66de571..ddc42d07cdb 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h @@ -19,14 +19,14 @@ #define TAO_TLS_BASICLOGFACTORY_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/Log/BasicLog_i.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/BasicLog_i.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index 17499a8b671..dfcb7dbc492 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/BasicLog_i.h" +#include "orbsvcs/Log/BasicLog_i.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogMgr_i.h" ACE_RCSID (Log, BasicLog_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index b6f837e2de6..79ad3c33366 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -21,13 +21,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Log/Log_i.h" +#include "orbsvcs/Log/Log_i.h" #include "log_export.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp index f00ce56edef..04187810399 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/EventLog_i.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/EventLog_i.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogNotification.h" ACE_RCSID (Log, EventLogConsumer, diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h index 933bcc1c2e4..ccff8564687 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h @@ -19,16 +19,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsEventLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/Log_i.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/DsEventLogAdminS.h" +#include "orbsvcs/Log/Log_i.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "eventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp index 08550f254e5..800174ac1e9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/EventLogFactory_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Log/EventLogNotification.h" +#include "orbsvcs/Log/EventLogFactory_i.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/EventLogNotification.h" #include "ace/Auto_Ptr.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h index 8c708aeefed..37e9f9fb39c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h @@ -20,17 +20,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsEventLogAdminS.h" +#include "orbsvcs/DsEventLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "EventLog_i.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp index 9dfb1fa5c5a..7efe128c8b3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Log/EventLogNotification.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/EventLogNotification.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h index 582b9eaa533..ae29afa6b24 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h @@ -20,16 +20,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/DsEventLogAdminS.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" -#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/DsEventLogAdminS.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/CosEventCommS.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 76e5f3afd74..a76aeb0ada8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/EventLog_i.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/EventLog_i.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogNotification.h" ACE_RCSID (Log, EventLog_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h index f4fb4b15618..5f1329741ee 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h @@ -20,17 +20,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsEventLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/Log_i.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/Log/EventLogConsumer.h" +#include "orbsvcs/DsEventLogAdminS.h" +#include "orbsvcs/Log/Log_i.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/Log/EventLogConsumer.h" #include "eventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp index ac4780e1dcc..fcbf59d24e0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -1,8 +1,8 @@ #include "Iterator_i.h" -#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h" -#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h" -#include "orbsvcs/orbsvcs/DsLogAdminC.h" +#include "orbsvcs/Log/Log_Constraint_Interpreter.h" +#include "orbsvcs/Log/Log_Constraint_Visitors.h" +#include "orbsvcs/DsLogAdminC.h" ACE_RCSID (Log, Iterator_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h index e192849618c..d4bfe613ca9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h @@ -19,13 +19,13 @@ #define TAO_TLS_ITERATOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Log/LogRecordStore.h" +#include "orbsvcs/Log/LogRecordStore.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h index 6dd3aeceed2..618fa0ba5b3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -18,13 +18,13 @@ #define TAO_TLS_LOGMGR_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Log/Log_i.h" +#include "orbsvcs/Log/Log_i.h" #include "log_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp index 697e70aa687..0a99e274bcf 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h index 763ddace35c..99f08b0e7a6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h @@ -18,13 +18,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsLogNotificationS.h" +#include "orbsvcs/DsLogNotificationS.h" #include "log_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp index 74038ad3d20..ddbb9953e8b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp @@ -1,8 +1,8 @@ -#include "orbsvcs/orbsvcs/Log/LogRecordStore.h" +#include "orbsvcs/Log/LogRecordStore.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" -#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h" -#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h" +#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/Log/Log_Constraint_Interpreter.h" +#include "orbsvcs/Log/Log_Constraint_Visitors.h" #include "ace/OS_NS_sys_time.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h index c016786c432..14fb7f5c398 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h @@ -19,13 +19,13 @@ #define TAO_LOG_RECORD_STORE_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsLogAdminC.h" +#include "orbsvcs/DsLogAdminC.h" #include "ace/Containers.h" #include "ace/Hash_Map_Manager.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h index e365b351982..9d077d162e4 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h @@ -19,14 +19,14 @@ #define TAO_LOG_CONSTRAINT_INTERPRETER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h" +#include "orbsvcs/ETCL/ETCL_Interpreter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/orbsvcs/DsLogAdminC.h" +#include "orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/DsLogAdminC.h" #include "log_export.h" class TAO_Log_Constraint_Visitor; diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index 66c6fc561f9..59f18a7d98f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -1,7 +1,7 @@ #include "Log_Constraint_Visitors.h" -#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/orbsvcs/ETCL/ETCL_y.h" +#include "orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/ETCL/ETCL_y.h" #include "tao/DynamicAny/DynArray_i.h" #include "tao/DynamicAny/DynSequence_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h index 4a4866e222f..2cb65f58b6f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h @@ -26,8 +26,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h" -#include "orbsvcs/orbsvcs/DsLogAdminC.h" +#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h" +#include "orbsvcs/DsLogAdminC.h" #include "tao/Typecode.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index c98877f9f8e..0e1f1242ced 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -1,9 +1,9 @@ -#include "orbsvcs/orbsvcs/Log/Log_i.h" +#include "orbsvcs/Log/Log_i.h" -#include "orbsvcs/orbsvcs/Log/Iterator_i.h" -#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h" -#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Log/Iterator_i.h" +#include "orbsvcs/Log/Log_Constraint_Interpreter.h" +#include "orbsvcs/Log/Log_Constraint_Visitors.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 2181e2d7e72..9024075a59b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -20,14 +20,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Log/LogRecordStore.h" +#include "orbsvcs/Log/LogRecordStore.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/DsLogAdminS.h" #include "ace/Reactor.h" #include "log_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index 7a79e1680f7..97c9bc2d6b2 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/NotifyLog_i.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/NotifyLog_i.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogNotification.h" ACE_RCSID (Log, NotifyLogConsumer, diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h index d20ae88f2dd..d7f8a0086ee 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h @@ -18,14 +18,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/Log_i.h" +#include "orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/Log/Log_i.h" #include "notifylog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index 8bdfefc87ec..c170bfc266a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Log/NotifyLogNotification.h" +#include "orbsvcs/Log/NotifyLogFactory_i.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/NotifyLogNotification.h" ACE_RCSID (Log, NotifyLogFactory_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h index f887c674f94..a6ad82cca03 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h @@ -18,14 +18,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/DsNotifyLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/Log/LogMgr_i.h" #include "NotifyLog_i.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp index 8c161bff3ff..53434e73a9b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Log/NotifyLogNotification.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/NotifyLogNotification.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h index 0dc5d4997e5..c9b47b2f773 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h @@ -20,16 +20,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/DsNotifyLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosEventCommS.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosEventCommS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNamingC.h" #include "notifylog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index 20bc3f9ea0a..88e58478c13 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/NotifyLog_i.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/NotifyLog_i.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogNotification.h" ACE_RCSID (Log, NotifyLog_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h index 63fbb632bd0..39d6d275cab 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h @@ -19,15 +19,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/Log_i.h" -#include "orbsvcs/orbsvcs/Log/NotifyLogConsumer.h" +#include "orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/Log/Log_i.h" +#include "orbsvcs/Log/NotifyLogConsumer.h" #include "notifylog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp index bf08953799a..89e7127cfa0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp @@ -3,7 +3,7 @@ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_sys_time.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h index 883b65d21a9..1d84b0bb64d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h @@ -17,14 +17,14 @@ #define TAO_PERSIST_STORE_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #include "tao/Typecode.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsLogAdminC.h" +#include "orbsvcs/DsLogAdminC.h" #include "ace/Mutex.h" #define PERSIST_LOG_DEFAULT_MAX_REC_LIST_LEN 250 diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp index 69a8009f059..018bc2388e4 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp @@ -1,16 +1,16 @@ -#include "orbsvcs/orbsvcs/Log/RTEventLog_i.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h" -#include "orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h" -#include "orbsvcs/orbsvcs/Event/EC_SupplierControl.h" +#include "orbsvcs/Log/RTEventLog_i.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Dispatching.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/Event/EC_Timeout_Generator.h" +#include "orbsvcs/Event/EC_ObserverStrategy.h" +#include "orbsvcs/Event/EC_ConsumerControl.h" +#include "orbsvcs/Event/EC_SupplierControl.h" #include "ace/Dynamic_Service.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h index 1fd91e51bca..76e3dc1583f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h @@ -19,17 +19,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RTEventLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/Log_i.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Factory.h" -#include "orbsvcs/orbsvcs/Event/EC_Defaults.h" +#include "orbsvcs/RTEventLogAdminS.h" +#include "orbsvcs/Log/Log_i.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Factory.h" +#include "orbsvcs/Event/EC_Defaults.h" #include "rteventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp index 12d794c9a4f..022ff15dfb6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp @@ -1,25 +1,25 @@ -#include "orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Log/RTEventLogNotification.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/orbsvcs/Event/Module_Factory.h" -#include "orbsvcs/orbsvcs/Event/Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Log/RTEventLogFactory_i.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/RTEventLogNotification.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/ESF/ESF_Peer_Workers.h" +#include "orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Auto_Ptr.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i" +#include "orbsvcs/Event/EC_ConsumerAdmin.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h index 5be76ec71b9..42b25823cbb 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h @@ -18,17 +18,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RTEventLogAdminS.h" +#include "orbsvcs/RTEventLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/CosNamingC.h" #include "RTEventLog_i.h" #include "rteventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp index 5d4a3788101..50bf6175c89 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp @@ -1,22 +1,22 @@ -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Log/RTEventLogNotification.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/RTEventLogNotification.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" -#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h" -#include "orbsvcs/orbsvcs/Event/EC_Filter_Builder.h" -#include "orbsvcs/orbsvcs/Event/EC_QOS_Info.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h" -#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/ESF/ESF_Peer_Workers.h" +#include "orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_Dispatching.h" +#include "orbsvcs/Event/EC_Filter_Builder.h" +#include "orbsvcs/Event/EC_QOS_Info.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Scheduling_Strategy.h" +#include "orbsvcs/Event/EC_ConsumerControl.h" +#include "orbsvcs/ESF/ESF_RefCount_Guard.h" +#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" ACE_RCSID (Log, RTEventLogNotification, diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h index 2ae3fd2ad6c..b6f1718cbce 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h @@ -20,18 +20,18 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/RTEventLogAdminS.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/RTEventLogAdminS.h" +#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" #include "rteventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp index 68d87cd2f20..84fc071fcc6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp @@ -1,16 +1,16 @@ -#include "orbsvcs/orbsvcs/Log/RTEventLog_i.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h" -#include "orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h" -#include "orbsvcs/orbsvcs/Event/EC_SupplierControl.h" +#include "orbsvcs/Log/RTEventLog_i.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Dispatching.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/Event/EC_Timeout_Generator.h" +#include "orbsvcs/Event/EC_ObserverStrategy.h" +#include "orbsvcs/Event/EC_ConsumerControl.h" +#include "orbsvcs/Event/EC_SupplierControl.h" #include "ace/Dynamic_Service.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h index 622b25ff925..3601e347781 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h @@ -18,18 +18,18 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RTEventLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/Log_i.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Factory.h" -#include "orbsvcs/orbsvcs/Event/EC_Defaults.h" -#include "orbsvcs/orbsvcs/Log/RTEventLogConsumer.h" +#include "orbsvcs/RTEventLogAdminS.h" +#include "orbsvcs/Log/Log_i.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Factory.h" +#include "orbsvcs/Event/EC_Defaults.h" +#include "orbsvcs/Log/RTEventLogConsumer.h" #include "rteventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h index 68cfe397c9a..4fc1f6b85ef 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h @@ -23,7 +23,7 @@ #include "ace/SString.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "naming_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index e500888109e..f113da90784 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosNamingS.h" +#include "orbsvcs/CosNamingS.h" #include "naming_export.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h index 624b0a15949..601ad73e463 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Naming/Naming_Utils.h" class TAO_Naming_Export TAO_Naming_Loader : public TAO_Object_Loader { diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp index 29c50161624..39ca0e87014 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp @@ -6,7 +6,7 @@ #include "Storable_Naming_Context.h" #include "Storable_Naming_Context_Activator.h" #include "Flat_File_Persistence.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "tao/debug.h" #include "tao/default_ports.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h index e4d0d92e235..ff2daa322c5 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h @@ -21,8 +21,8 @@ #include /**/ "ace/pre.h" #include "tao/ORB.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/IOR_Multicast.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/IOR_Multicast.h" #include "Naming_Context_Interface.h" #include "nsconf.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h index bc4d9f22dad..91a5aa17e10 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "ace/Hash_Map_With_Allocator_T.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "naming_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index 92d8788807f..c01902fea7e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -9,7 +9,7 @@ ACE_RCSID (Notify, TAO_Notify_Admin, "$Id$") -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/CosNotifyChannelAdminC.h" #include "Container_T.h" #include "Proxy.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp index 74b0ec9f268..1d373b8eac8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp @@ -10,7 +10,7 @@ ACE_RCSID (Notify, TAO_Notify_AdminProperties, "$Id$") -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" TAO_Notify_AdminProperties::TAO_Notify_AdminProperties (void) : max_global_queue_length_ (CosNotification::MaxQueueLength, 0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h index 69e19fce382..6ca5f07e18c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h @@ -23,7 +23,7 @@ #include "../Event.h" #include "../EventType.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" class TAO_Notify_Consumer; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h index d1bfcce96ae..0d115c82f31 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "../ProxyConsumer_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h index a03473c6ca1..b84edf1d5ed 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "../ProxySupplier_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h index 06267731c7a..5df73af9779 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxyConsumer_T.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h index 4402cb21ad4..b4f18be42f9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h @@ -20,8 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/Event_ForwarderS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/Event_ForwarderS.h" #include "../ProxySupplier_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp index fd1ee695630..d26302a2cee 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Notify, "$Id$") #include "ace/Refcounted_Auto_Ptr.h" -#include "orbsvcs/orbsvcs/CosEventCommC.h" +#include "orbsvcs/CosEventCommC.h" #include "../Event.h" TAO_Notify_PushConsumer::TAO_Notify_PushConsumer (TAO_Notify_ProxySupplier* proxy) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h index 5186338831e..98e48b52381 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyCommC.h" #include "../Consumer.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h index 9beba8f8d00..8cdf891d598 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" class TAO_Notify_ProxyConsumer; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index 01eb6d0b631..55acfa6f5dc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -12,7 +12,7 @@ ACE_RCSID (Notify, #include "ace/Message_Queue.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" #include "Method_Request.h" #include "Notify_Extensions.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h index d9159c14863..b60ed0ce9b0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h @@ -23,7 +23,7 @@ #include "ace/Null_Condition.h" #include "ace/Message_Queue.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "orbsvcs/TimeBaseC.h" #include "Property.h" #include "Property_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h index d5c959508d3..e42cc2ad59f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h @@ -22,8 +22,8 @@ #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/NotifyExtC.h" #include "AdminProperties.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h index f7ff532b790..9b18e9335e7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h @@ -20,8 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotificationC.h" #include "Peer.h" #include "Event.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 3f9a5f08608..5552b0df58b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -11,7 +11,7 @@ ACE_RCSID (RT_Notify, "$Id$") #include "ace/Auto_Ptr.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Subscription_Change_Worker.h" #include "Proxy.h" #include "EventChannel.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h index 394f43568b0..0f41aaa9f68 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/NotifyExtS.h" +#include "orbsvcs/NotifyExtS.h" #include "Admin.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp index e469099bfa1..f3dddbcffe4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp @@ -9,8 +9,8 @@ #include "Factory.h" #include "POA_Helper.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "Container_T.inl" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h index 59a953d6a46..23604de6421 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" /** * @class TAO_Notify_Container_T diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index 5e97efabfa8..42d441b8513 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -8,7 +8,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Dynamic_Service.h" #include "tao/ORB_Core.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" #include "tao/debug.h" ACE_RCSID (Notify, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp index 4dc6a1be779..71bf67b948f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp @@ -10,8 +10,8 @@ ACE_RCSID (Notify, TAO_Notify_Default_Factory, "$Id$") -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h" +#include "orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/ESF/ESF_Copy_On_Write.h" #include "EventChannelFactory.h" #include "EventChannel.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index 8f7f4c667bf..d3056151c25 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -22,7 +22,7 @@ #include "ace/Containers_T.h" #include "ace/Hash_Map_Manager.h" #include "ace/Atomic_Op.h" -#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/CosNotifyFilterS.h" #include "Notify_Constraint_Interpreter.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h index 290d305d385..6a51767c8a5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/CosNotifyFilterS.h" #include "FilterFactory.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp index 60fbdcbec72..b731ccf5f4d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Notify, "$Id$") #include "tao/debug.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" TAO_Notify_Event::TAO_Notify_Event (void) :priority_ (CosNotification::Priority, CosNotification::DefaultPriority), diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h index 595e666c059..d931edf6a9a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h @@ -23,9 +23,9 @@ #include "ace/Copy_Disabled.h" #include "ace/Refcounted_Auto_Ptr.h" -#include "orbsvcs/orbsvcs/Event_ForwarderS.h" -#include "orbsvcs/orbsvcs/CosNotifyFilterC.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/Event_ForwarderS.h" +#include "orbsvcs/CosNotifyFilterC.h" +#include "orbsvcs/CosNotificationC.h" #include "Property.h" #include "Property_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h index b2fcdf3618c..eaac0a7ce8c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "Object.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h index 21db8d744e0..3f5c1745c4f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h @@ -20,8 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/NotifyExtS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/NotifyExtS.h" #include "Object.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h index c4a43ef34b4..c607c4dec95 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" /** * @class TAO_Notify_EventType diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h index 05bd7babae0..317891d5dde 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "tao/orbconf.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp index a9b78c54179..089a32adca0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp @@ -13,7 +13,7 @@ ACE_RCSID (Notify, TAO_Notify_Event_Map_Entry_T, "$Id$") -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Properties.h" #include "Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp index bad6e640cac..77de698806d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp @@ -4,7 +4,7 @@ #define TAO_Notify_EVENT_MAP_T_C #include "Event_Map_T.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Event_Map_Entry_T.h" #include "Properties.h" #include "Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h index 7f7eb146061..1ac91e18473 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/CosNotifyFilterS.h" #include "ace/Hash_Map_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h index 9fcf4aa8c7f..a5123bdbd1b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "Container_T.h" #include "Object.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h index e2c29af3b0d..4668713446d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "Method_Request.h" #include "ProxyConsumer.h" #include "Consumer_Map.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h index 9f99375103e..2b7d34f2044 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "ProxySupplier.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h index 6d38a1e3013..d580f0533bb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -15,14 +15,14 @@ #define TAO_NOTIFY_CONSTRAINT_INTERPRETER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h" +#include "orbsvcs/ETCL/ETCL_Interpreter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/orbsvcs/CosNotifyFilterC.h" +#include "orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/CosNotifyFilterC.h" #include "notify_export.h" class TAO_Notify_Constraint_Visitor; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index 2b47025061a..55fe28b9c8b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -1,8 +1,8 @@ /* $Id$ */ #include "Notify_Constraint_Visitors.h" -#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/orbsvcs/ETCL/ETCL_y.h" +#include "orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/ETCL/ETCL_y.h" #include "tao/Any_Unknown_IDL_Type.h" #include "tao/DynamicAny/DynArray_i.h" #include "tao/DynamicAny/DynSequence_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h index c97c326b4ed..bea7eb79521 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -22,8 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h" +#include "orbsvcs/CosNotificationC.h" #include "tao/Typecode.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h index 21fdb8359bc..c26c63b15f1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -13,7 +13,7 @@ #define NOTIFY_EVENTCHANNELFACTORY_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h index 216dcb9cd8c..f13e1fc8999 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h @@ -22,7 +22,7 @@ #include "tao/PortableServer/Servant_Base.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" #include "QoSProperties.h" #include "AdminProperties.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h index 710dd3e1202..345d8878c1b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" #include "EventTypeSeq.h" class TAO_Notify_Proxy; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp index ecdfac34c9b..f9f7f9d567f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Properties.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" #include "tao/debug.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h index 5d938efd4dc..98bd425dfd3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h @@ -24,7 +24,7 @@ #include "tao/ORB.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" class TAO_Notify_Factory; class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property.h b/TAO/orbsvcs/orbsvcs/Notify/Property.h index f551b53c1a7..a9243b79afa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property.h @@ -23,7 +23,7 @@ #include "tao/orbconf.h" #include "tao/TimeBaseC.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" template <class LOCK, class TYPE> class ACE_Atomic_Op; template <class TYPE> class TAO_Notify_Property_T; diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h index 72554b0170d..4b5a4011f9d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h index 71cf25ad690..f2423d6a7a6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" class TAO_Notify_PropertySeq; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h index 88362f193b4..5ad9b2b0654 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h @@ -22,7 +22,7 @@ #include "ace/SString.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" class TAO_Notify_PropertySeq; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h index 523c572b0a7..489d5cbe077 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/CosEventChannelAdminC.h" #include "Refcountable_Guard_T.h" #include "Event.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h index 641aab7f7b1..8b772111525 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h @@ -22,7 +22,7 @@ #include "Event.h" #include "Proxy.h" #include "Refcountable_Guard_T.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/CosEventChannelAdminC.h" class TAO_Notify_Consumer; class TAO_Notify_ConsumerAdmin; diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp index 3850565c129..ecbcb9a205d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp @@ -7,7 +7,7 @@ #include "ETCL_FilterFactory.h" #include "RT_POA_Helper.h" #include "Properties.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" #include "Object.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp index 6c049c0713e..4a507f456f7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp @@ -3,7 +3,7 @@ #include "RT_POA_Helper.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/debug.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" #include "RT_Properties.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h index 85bcdecd998..24b3491f52c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "POA_Helper.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" /** * @class TAO_Notify_RT_POA_Helper diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h index 356bbde952f..408564117f7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "Container_T.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h index 21e6c057798..321e2b9878d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxyConsumer_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h index 640e8a0f1b4..923138c2d39 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxySupplier_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h index ef22534d68a..b5680908d22 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" class TAO_Notify_ProxyConsumer; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h index 06536f80d13..cd615f00b6e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h @@ -22,7 +22,7 @@ #include "ace/Service_Object.h" #include "ace/Service_Config.h" #include "ace/Service_Object.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "tao/PortableServer/PortableServer.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h index c964fdc8937..7a7922b960c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h @@ -20,7 +20,7 @@ #include "../Event.h" #include "../EventType.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" /** * @class TAO_Notify_StructuredEvent_No_Copy diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h index 143f1d5bd03..d979d1bacf6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxyConsumer_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h index d71db430726..026c155b3e0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h @@ -20,8 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/Event_ForwarderS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/Event_ForwarderS.h" #include "../ProxySupplier_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h index 36f6f7f8096..98257c8c2bd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyCommC.h" #include "../Consumer.h" class TAO_Notify_ProxySupplier; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h index 65e95c3d175..8d7cd70a311 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" class TAO_Notify_ProxyConsumer; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h index 5763746a3c0..8a377d1a06a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotificationC.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/ESF/ESF_Worker.h" class TAO_Notify_Proxy; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h index 8494f431b98..64fea3a6bd4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h @@ -21,7 +21,7 @@ #include "Peer.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyCommC.h" class TAO_Notify_ProxyConsumer; /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp index 5df0e4487eb..37823207801 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -10,7 +10,7 @@ ACE_RCSID (RT_Notify, TAO_Notify_SupplierAdmin, "$Id$") -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Builder.h" #include "Proxy.h" #include "EventChannel.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h index c9ae1a3ff5d..0b58745597c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/NotifyExtS.h" +#include "orbsvcs/NotifyExtS.h" #include "Admin.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h index eaa82e6fa23..da03189be1b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index ec531c6db41..3f9ae599e2b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -31,7 +31,7 @@ namespace TAO ///////////////////////////////// // Includes needed by this header #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupS.h" +#include "orbsvcs/PortableGroupS.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h index 383c2d212eb..ff2033929ff 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h @@ -24,7 +24,7 @@ #include "PG_Factory_Set.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h index f02e4ef24d7..3bca619031f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "ace/Array_Base.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h index 2f9cd627c70..8123d3d3828 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h @@ -25,7 +25,7 @@ #include "PG_Factory_Map.h" #include "portablegroup_export.h" #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index a4ed36858b7..810f444574a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -13,7 +13,7 @@ #include "PG_Group_Factory.h" #include "PG_Property_Utils.h" #include "PG_conf.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "PG_Object_Group.h" #include <orbsvcs/orbsvcs/PortableGroup/PG_Utils.h> diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h index 5ee17c6fe25..e5b47d0434c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h @@ -24,7 +24,7 @@ #include "ace/Hash_Map_Manager.h" #include "portablegroup_export.h" #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "PG_Object_Group_Manipulator.h" ////////////////// diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h index afeb6b0f0e3..224daf9c011 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h @@ -24,7 +24,7 @@ #include "PG_Operators.h" #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h index e79eee61713..105ef25e6db 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "ace/ACE.h" /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h index 803c91fef12..6786897aa0f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h @@ -25,7 +25,7 @@ #include "PG_Location_Hash.h" #include "PG_Location_Equal_To.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "ace/Array_Base.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h index b0946aee165..919c58f7ca5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "ace/Unbounded_Set.h" /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h index ca507057adb..573430ccf66 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index 8a3610bf7b4..962a9a1232a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupS.h" +#include "orbsvcs/PortableGroupS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h index 0f43e24cfb6..b754df541a2 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h @@ -24,7 +24,7 @@ #include "PG_MemberInfo.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "tao/PortableServer/Key_Adapters.h" #include "tao/PortableServer/PortableServerC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index fd15c9ed07a..1dd180acf08 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -33,7 +33,7 @@ #include "PG_Location_Hash.h" #include "PG_Location_Equal_To.h" #include "PG_Object_Group_Manipulator.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "tao/PortableServer/PortableServer.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/ACE.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h index 3efa0733b9b..0dcd056438c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h @@ -15,7 +15,7 @@ #define TAO_PG_OBJECT_GROUP_MANIPULATOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/PortableGroupS.h" +#include "orbsvcs/PortableGroupS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h index 955edabcb44..881c5330403 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h @@ -23,7 +23,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" /// Global CosNaming::Name equality operator. /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h index a44f8f08cf3..d171ec5590a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h @@ -19,8 +19,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupS.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/PortableGroupS.h" +#include "orbsvcs/CosNamingC.h" #include "portablegroup_export.h" #include "ace/Vector_T.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h index bcb172e10ed..3d49398a974 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h @@ -24,7 +24,7 @@ #include "PG_Default_Property_Validator.h" #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupS.h" +#include "orbsvcs/PortableGroupS.h" #include "ace/Functor.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h index df3ef19c8bd..ebfdf10f3d1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h @@ -21,8 +21,8 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupS.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/PortableGroupS.h" +#include "orbsvcs/CosNamingC.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h index f92ee4608d3..ca02b71a413 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" namespace TAO_PG diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h index e06cb37338a..f919cbbbba6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h @@ -14,7 +14,7 @@ #define TAO_PORTABLEGROUP_UTILS_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h index cb517a5b7fb..dcb0e3d5a5e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h @@ -22,7 +22,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #ifndef TAO_PG_MAX_OBJECT_GROUPS // @@ why create arbitrary limits? /// The maximum number of object groups to be managed by the diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h index a5468f224ab..f1bb0a0dadf 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h @@ -23,7 +23,7 @@ #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" // Forward references class PortableGroup_Request_Dispatcher; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h index 53defa5a3b8..e98a74c367d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h @@ -23,7 +23,7 @@ #include "ace/Hash_Map_Manager_T.h" #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "tao/Object_KeyC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index e86dd663778..ecd5b159eff 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -12,8 +12,8 @@ #include "tao/target_specification.h" #include "ace/os_include/os_ctype.h" -#include "orbsvcs/orbsvcs/miopC.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/miopC.h" +#include "orbsvcs/PortableGroupC.h" ACE_RCSID (PortableGroup, UIPMC_Profile, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h index 718e2189352..d36affa5d6a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h @@ -26,7 +26,7 @@ #include "tao/Object_KeyC.h" #include "tao/target_specification.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "UIPMC_Endpoint.h" #include "portablegroup_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 660ff9e4a0a..c8345528754 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -13,7 +13,7 @@ // // ============================================================================ -#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h" +#include "orbsvcs/Property/CosPropertyService_i.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index b1b8db89c92..0c9b289bb2b 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Property/property_export.h" +#include "orbsvcs/Property/property_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosPropertyServiceS.h" +#include "orbsvcs/CosPropertyServiceS.h" #include "ace/Hash_Map_Manager.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index 5f6507cdb91..1d8f66b8315 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "orbsvcs/orbsvcs/Time_Utilities.h" -#include "orbsvcs/orbsvcs/Runtime_Scheduler.h" +#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/Runtime_Scheduler.h" #include "ace/OS_NS_string.h" #if defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Runtime_Scheduler.i" +#include "orbsvcs/Runtime_Scheduler.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (orbsvcs, diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h index 6c2430af091..18243c7d367 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h @@ -18,9 +18,9 @@ #define ACE_RUNTIME_SCHEDULER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/orbsvcs/Sched/sched_export.h" +#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/Sched/sched_export.h" class TAO_RTSched_Export ACE_Runtime_Scheduler : public POA_RtecScheduler::Scheduler { @@ -280,7 +280,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Runtime_Scheduler.i" +#include "orbsvcs/Runtime_Scheduler.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h index 5ea0b77669f..d4da8a87a43 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h @@ -24,7 +24,7 @@ #include "SSLIOP_Current.h" -#include "orbsvcs/orbsvcs/SSLIOPC.h" +#include "orbsvcs/SSLIOPC.h" #include "tao/IIOP_Connection_Handler.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h index b0868330068..35c7786ddc8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h @@ -30,8 +30,8 @@ #include "SSLIOP_Connection_Handler.h" #include "SSLIOP_Accept_Strategy.h" -#include "orbsvcs/orbsvcs/SSLIOPC.h" /* CSIv1 */ -#include "orbsvcs/orbsvcs/CSIIOPC.h" /* CSIv2 */ +#include "orbsvcs/SSLIOPC.h" /* CSIv1 */ +#include "orbsvcs/CSIIOPC.h" /* CSIv2 */ namespace TAO { diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h index aacb3c5a950..647a42edd0b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h @@ -16,16 +16,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h" -#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h" +#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h" +#include "orbsvcs/SSLIOP/SSLIOP_SSL.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 816b8829f44..ba933c34608 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -4,7 +4,7 @@ #include "SSLIOP_Util.h" #include "SSLIOP_X509.h" -#include "orbsvcs/orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/SecurityLevel2C.h" #include "tao/debug.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index 1480674ab2b..89b27c15a62 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -23,7 +23,7 @@ #include "SSLIOP_X509.h" #include "SSLIOP_EVP_PKEY.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h index 4a391c83497..e1d1e5778bf 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h @@ -15,16 +15,16 @@ #define TAO_SSLIOP_CREDENTIALS_ACQUIRER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h" +#include "orbsvcs/Security/SL3_CredentialsCurator.h" -#include "orbsvcs/orbsvcs/SSLIOPC.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SSLIOPC.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h index 791dcde0da5..6918b068b0d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h @@ -16,15 +16,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h" +#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index 1a201756b10..1921057cfc4 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -23,7 +23,7 @@ #include "SSLIOP_Current_Impl.h" -#include "orbsvcs/orbsvcs/SSLIOPC.h" +#include "orbsvcs/SSLIOPC.h" #include "tao/ORB_Core.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h index 6ba6569f23b..5502393a62b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h @@ -21,8 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SSLIOPC.h" -#include "orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h" +#include "orbsvcs/SSLIOPC.h" +#include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h" #include "tao/ORB_Core.h" #include <openssl/ssl.h> diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h index 05456cc7c54..fdd3490f063 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h @@ -26,8 +26,8 @@ #include "SSLIOP_OwnCredentials.h" -#include "orbsvcs/orbsvcs/SSLIOPC.h" -#include "orbsvcs/orbsvcs/SecurityC.h" +#include "orbsvcs/SSLIOPC.h" +#include "orbsvcs/SecurityC.h" #include "tao/IIOP_Endpoint.h" #include "ace/INET_Addr.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 48e4343961d..fbb32f89f96 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -4,7 +4,7 @@ #include "SSLIOP_ORBInitializer.h" #include "ace/OS_NS_strings.h" -#include "orbsvcs/orbsvcs/Security/Security_ORBInitializer.h" /// @todo should go away +#include "orbsvcs/Security/Security_ORBInitializer.h" /// @todo should go away //#include "orbsvcs/CSIIOPC.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h index a80578eb718..73a16174959 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h @@ -25,8 +25,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityC.h" -#include "orbsvcs/orbsvcs/CSIIOPC.h" +#include "orbsvcs/SecurityC.h" +#include "orbsvcs/CSIIOPC.h" #include "tao/Protocol_Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h index 45740ab8cd0..9e47848971a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SSLIOPC.h" +#include "orbsvcs/SSLIOPC.h" #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index d7fe7e70c57..efa08eeb608 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -11,11 +11,11 @@ ACE_RCSID (SSLIOP, //#include "SSLIOP_IORInterceptor.h" #include "SSLIOP_CredentialsAcquirerFactory.h" -#include "orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h" -#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h" +#include "orbsvcs/Security/SL3_SecurityCurrent.h" +#include "orbsvcs/Security/SL3_CredentialsCurator.h" -#include "orbsvcs/orbsvcs/SSLIOPC.h" -#include "orbsvcs/orbsvcs/CSIIOPC.h" +#include "orbsvcs/SSLIOPC.h" +#include "orbsvcs/CSIIOPC.h" #include "tao/Exception.h" #include "tao/ORBInitInfo.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h index 01f626a049d..544208d40b7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h @@ -22,8 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CSIIOPC.h" -#include "orbsvcs/orbsvcs/SecurityC.h" +#include "orbsvcs/CSIIOPC.h" +#include "orbsvcs/SecurityC.h" #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h index a4a7fc21cb0..e19b6659bf6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h @@ -45,7 +45,7 @@ #include "tao/Sequence_T.h" #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" -#include "orbsvcs/orbsvcs/SSLIOPC.h" +#include "orbsvcs/SSLIOPC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl index 64feb29fa16..969aaad85f6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl @@ -35,7 +35,7 @@ #ifndef _SSL_ENDPOINTS_IDL_ #define _SSL_ENDPOINTS_IDL_ -#include "orbsvcs/orbsvcs/SSLIOP.idl" +#include "orbsvcs/SSLIOP.idl" // Stores information for a collection of SSLIOP endpoints. typedef sequence <SSLIOP::SSL> TAO_SSLEndpointSequence; diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index 57be42611e4..a1bd57f1ae8 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -4,8 +4,8 @@ // // ============================================================================ -#include "orbsvcs/orbsvcs/Time_Utilities.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/Scheduler_Factory.h" #include "Config_Scheduler.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index 42500375d5b..abf9af35069 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -11,15 +11,15 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/Event_Service_Constants.h" #include "sched_export.h" #if defined (TAO_USES_STRATEGY_SCHEDULER) -#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h" +#include "orbsvcs/Sched/Strategy_Scheduler.h" #else -#include "orbsvcs/orbsvcs/Sched/Scheduler_Generic.h" +#include "orbsvcs/Sched/Scheduler_Generic.h" #endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */ class TAO_RTSched_Export ACE_Config_Scheduler diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp index 9f2597df83f..f5e75f3118e 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp @@ -22,7 +22,7 @@ #include "Reconfig_Sched_Utils.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h index b407bfaf1db..225fa09960e 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h @@ -24,8 +24,8 @@ #include "ace/config-all.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/RtecSchedulerS.h" #include "sched_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h index 98b1e11baa8..4e46f2f8a63 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h @@ -23,8 +23,8 @@ #include "ace/Hash_Map_Manager.h" #include "ace/RB_Tree.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/RtecSchedulerS.h" #include "Reconfig_Sched_Utils.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index debe5809f00..a6a16be05f2 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -19,7 +19,7 @@ #define TAO_RECONFIG_SCHEDULER_T_C #include "Reconfig_Scheduler_T.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "ace/Auto_Ptr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h index 0e0a6e2074f..87cf62c1668 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h @@ -22,8 +22,8 @@ #include /**/ "ace/pre.h" #include "sched_export.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/Event_Service_Constants.h" #include "ace/Containers.h" ////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp index 26d5d0cfba0..9619eceb420 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp @@ -17,7 +17,7 @@ // ============================================================================ #include "ace/Sched_Params.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "Scheduler.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h index 5403d9013c6..abb37fc6cee 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h @@ -33,8 +33,8 @@ #include "ace/SString.h" #include "ace/Unbounded_Set.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/Event_Service_Constants.h" #include "sched_export.h" class TAO_RTSched_Export ACE_Scheduler diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index fef9bfd0158..9b169d85ff7 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -4,13 +4,13 @@ #include "ace/Singleton.h" #include "ace/Null_Mutex.h" -#include "orbsvcs/orbsvcs/Runtime_Scheduler.h" -#include "orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h" -#include "orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Runtime_Scheduler.h" +#include "orbsvcs/Sched/Reconfig_Scheduler.h" +#include "orbsvcs/Sched/Reconfig_Sched_Utils.h" +#include "orbsvcs/Scheduler_Factory.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Scheduler_Factory.i" +#include "orbsvcs/Scheduler_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(orbsvcs, diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h index 2cd56b8f60b..aa43e530553 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h @@ -24,9 +24,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/orbsvcs/Sched/sched_export.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/Sched/sched_export.h" class TAO_Reconfig_Scheduler_Entry; struct TAO_RT_Info_Tuple; @@ -268,7 +268,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Scheduler_Factory.i" +#include "orbsvcs/Scheduler_Factory.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp index 5ae71bb106e..c21018bf426 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp @@ -2,10 +2,10 @@ #include "ace/OS.h" -#include "orbsvcs/orbsvcs/Scheduler_Utilities.h" +#include "orbsvcs/Scheduler_Utilities.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Scheduler_Utilities.i" +#include "orbsvcs/Scheduler_Utilities.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (orbsvcs, diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h index 745247b2ed1..beda9ed5551 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h @@ -18,13 +18,13 @@ #define ACE_SCHEDULER_UTILITIES_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Sched/sched_export.h" +#include "orbsvcs/Sched/sched_export.h" class TAO_RTSched_Export ACE_RT_Info : public RtecScheduler::RT_Info { @@ -61,7 +61,7 @@ public: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Scheduler_Utilities.i" +#include "orbsvcs/Scheduler_Utilities.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp index 8ae4f3bef13..c600d1c71c9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp @@ -1,7 +1,7 @@ // $Id$ #include "CSI_Utils.h" -#include "orbsvcs/orbsvcs/CSIC.h" +#include "orbsvcs/CSIC.h" #include "tao/CDR.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h index 7818fa3504f..eeb4bc7ddc9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/SecurityLevel2C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h index 6cf09884257..a349ef444a1 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/SecurityLevel2C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h index 946ec411ae2..3be591bcd38 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h @@ -15,13 +15,13 @@ #define TAO_SL3_CONTEXT_ESTABLISHMENT_POLICY_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Security/security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h index 9c77db90c02..6e593d6345d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h @@ -16,15 +16,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Security/security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h" +#include "orbsvcs/Security/SL3_CredentialsCurator.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h index b6b95a2c21a..712588d7548 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h @@ -15,13 +15,13 @@ #define TAO_SL3_CREDENTIALS_CURATOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Security/security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h index d35f2d51b0c..b2f7d901b26 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h @@ -16,13 +16,13 @@ #define TAO_SL3_OBJECT_CREDENTIALS_POLICY_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Security/security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h index 9c915f90d73..2cc6f6650f1 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Security/security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,7 +24,7 @@ #include "SL3_SecurityCurrent_Impl.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h index fcaaa0f629c..5b0b97162ad 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h @@ -22,7 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "security_export.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" namespace TAO { diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h index a7efd8cb1a1..61b615e9cbb 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h @@ -15,13 +15,13 @@ #define TAO_SL3_SECURITY_MANAGER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Security/security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index c1be7b22e78..673a5a2c952 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/SecurityLevel2C.h" #include "tao/ORB_Core.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h index 7ffe96e6d1b..a297564e3fd 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -22,7 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "security_export.h" -#include "orbsvcs/orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/SecurityLevel2C.h" namespace TAO { diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index df9b15396a6..673c4debebc 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -12,7 +12,7 @@ ACE_RCSID (Security, #include "SL3_CredentialsCurator.h" #include "SL3_SecurityManager.h" -#include "orbsvcs/orbsvcs/SecurityC.h" +#include "orbsvcs/SecurityC.h" #include "tao/ORBInitInfo.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index be257f8089c..87f0d172965 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -12,8 +12,8 @@ ACE_RCSID (Security, #include "SL3_ContextEstablishmentPolicy.h" #include "SL3_ObjectCredentialsPolicy.h" -#include "orbsvcs/orbsvcs/SecurityLevel2C.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl index 29cc213313d..c7beeefd060 100644 --- a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl +++ b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl @@ -5,7 +5,7 @@ #ifndef _SECURITY_REPLACEABLE_IDL_ #define _SECURITY_REPLACEABLE_IDL_ -#include "orbsvcs/orbsvcs/SecurityLevel2.idl" +#include "orbsvcs/SecurityLevel2.idl" #include "tao/IOP.pidl" #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h index 3e2146b3b4f..eef1f946440 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/TimeServiceS.h" +#include "orbsvcs/TimeServiceS.h" #include "TAO_UTO.h" #include "time_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h index 4a5da1e566d..9b4d444b128 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h @@ -19,9 +19,9 @@ #include /**/ "ace/pre.h" #include "ace/Reactor.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/orbsvcs/TimeServiceS.h" +#include "orbsvcs/TimeServiceS.h" #include "Timer_Helper.h" #include "time_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h index f7436e726a6..f83b3cb5701 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h @@ -18,7 +18,7 @@ #define TAO_TIME_SERVICE_SERVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/TimeServiceS.h" +#include "orbsvcs/TimeServiceS.h" #include "time_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h index 9614194039a..b705d2244d8 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h @@ -18,7 +18,7 @@ #define TAO_UTO_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/TimeServiceS.h" +#include "orbsvcs/TimeServiceS.h" #include "time_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h index b38dd4eae8b..5e89f43785d 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h @@ -27,7 +27,7 @@ #include "ace/Containers.h" #include "time_export.h" -#include "orbsvcs/orbsvcs/TimeServiceS.h" +#include "orbsvcs/TimeServiceS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp index 8525b8d0d87..0018ea15cf2 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #if !defined (__ACE_INLINE__) # include "orbsvcs/orbsvcs/Time_Utilities.i" diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h index dd2f5f01793..86759d4ae66 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h @@ -18,8 +18,8 @@ #define ORBSVCS_TIME_UTILITIES_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" -#include "orbsvcs/orbsvcs/svc_utils_export.h" +#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/svc_utils_export.h" #include "ace/OS_NS_time.h" class TAO_Svc_Utils_Export ORBSVCS_Time @@ -69,7 +69,7 @@ public: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Time_Utilities.i" +#include "orbsvcs/Time_Utilities.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index 0a5d53706ef..71cb7398e55 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -19,8 +19,8 @@ #include "Constraint_Visitors.h" #include "Interpreter.h" -#include "orbsvcs/orbsvcs/CosTradingS.h" -#include "orbsvcs/orbsvcs/CosTradingReposS.h" +#include "orbsvcs/CosTradingS.h" +#include "orbsvcs/CosTradingReposS.h" class TAO_Constraint_Evaluator; class TAO_Constraint_Validator; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h index 02fbfcb48c2..6cfea41fac4 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h @@ -19,7 +19,7 @@ #include "tao/Basic_Types.h" -#include "orbsvcs/orbsvcs/Trader/trading_export.h" +#include "orbsvcs/Trader/trading_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h index 0484d4330b5..0add8a6dc7e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h @@ -15,8 +15,8 @@ #define TAO_CONSTRAINT_VISITOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Trader/Interpreter_Utils.h" -#include "orbsvcs/orbsvcs/Trader/trading_export.h" +#include "orbsvcs/Trader/Interpreter_Utils.h" +#include "orbsvcs/Trader/trading_export.h" #include "ace/Containers.h" class TAO_DynSequence_i; @@ -85,7 +85,7 @@ public: virtual int visit_property (TAO_Property_Constraint* literal) = 0; }; -#include "orbsvcs/orbsvcs/Trader/Constraint_Nodes.h" +#include "orbsvcs/Trader/Constraint_Nodes.h" /** * @class TAO_Constraint_Validator diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h index b667227be47..ed3a4589d16 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h @@ -17,7 +17,7 @@ #include "Constraint_Nodes.h" #include "Constraint_Visitors.h" -#include "orbsvcs/orbsvcs/Trader/trading_export.h" +#include "orbsvcs/Trader/trading_export.h" class TAO_Constraint_Evaluator; class TAO_Constraint_Validator; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h index 7a8f4dcefc6..dcb1225ffa7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h @@ -21,7 +21,7 @@ #include "tao/Typecode.h" #include "tao/CORBA_String.h" -#include "orbsvcs/orbsvcs/Trader/trading_export.h" +#include "orbsvcs/Trader/trading_export.h" // = Classes to deal with the ACE_Hash_Map_Manager. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp index d907b2c4850..f621f592ea9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp @@ -3,8 +3,8 @@ #ifndef TAO_INTERPRETER_UTILS_CPP #define TAO_INTERPRETER_UTILS_CPP -#include "orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h" -#include "orbsvcs/orbsvcs/Trader/Constraint_Visitors.h" +#include "orbsvcs/Trader/Interpreter_Utils_T.h" +#include "orbsvcs/Trader/Constraint_Visitors.h" #include "tao/DynamicAny/DynSequence_i.h" template <class OPERAND_TYPE> CORBA::Boolean diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index f2d907306df..bd021fc0d11 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -25,10 +25,10 @@ #include "ace/Containers.h" -#include "orbsvcs/orbsvcs/CosTradingS.h" -#include "orbsvcs/orbsvcs/CosTradingReposS.h" -#include "orbsvcs/orbsvcs/CosTradingDynamicS.h" -#include "orbsvcs/orbsvcs/Trader/trading_export.h" +#include "orbsvcs/CosTradingS.h" +#include "orbsvcs/CosTradingReposS.h" +#include "orbsvcs/CosTradingDynamicS.h" +#include "orbsvcs/Trader/trading_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h index ff646edb63f..cb27e1c038f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h @@ -17,7 +17,7 @@ #include "Constraint_Visitors.h" #include "Trader.h" #include "Trader_Utils.h" -#include "orbsvcs/orbsvcs/CosTradingC.h" +#include "orbsvcs/CosTradingC.h" class TAO_Trading_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator { diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index fb86bce35f1..ff59d355062 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -24,9 +24,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/IOR_Multicast.h" -#include "orbsvcs/orbsvcs/Trader/Trader.h" -#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/IOR_Multicast.h" +#include "orbsvcs/Trader/Trader.h" +#include "orbsvcs/Trader/Service_Type_Repository.h" class TAO_Trading_Export TAO_Trading_Loader : public TAO_Object_Loader { diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp index e043721e26d..68953a71771 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp @@ -1,8 +1,8 @@ #include "ORBInitializer.h" #include "ServerRequestInterceptor.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h" +#include "orbsvcs/CosLoadBalancingC.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h index 773e034dace..d089c75ee9e 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h" +#include "orbsvcs/LoadBalancing/LB_LoadAlert.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h index 9eb4bbd955f..3e2bd11f9b2 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp index c61cd9640f8..b07d2c9add2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp @@ -9,8 +9,8 @@ #include "ORB_Task.h" #include "ORB_Task_Activator.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" #include "tao/PortableServer/PortableServer.h" #include "tao/RTPortableServer/RTPortableServer.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp index 63ff884f656..5fc7489897e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp @@ -8,7 +8,7 @@ #include "Consumer.h" #include "Implicit_Deactivator.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (TAO_PERF_RTEC, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h index fb105da7511..9a982381130 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h @@ -9,8 +9,8 @@ #define TAO_PERF_RTEC_CONSUMER_H #include "rtec_perf_export.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #include "ace/Sample_History.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp index 86f846853d5..b35d809551c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp @@ -11,7 +11,7 @@ #include "Shutdown.h" #include "Auto_Disconnect.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" #include "ace/High_Res_Timer.h" #include "ace/Sample_History.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h index 1c160b0370d..0c622a996a8 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h @@ -10,7 +10,7 @@ #define TAO_PERF_RTEC_EC_DESTROYER_H #include "rtec_perf_export.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp index cb7693306f9..2c3d1f8084e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp @@ -8,7 +8,7 @@ #include "Loopback_Consumer.h" #include "Implicit_Deactivator.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" ACE_RCSID (PERF_RTEC, Loopback_Consumer, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h index ba25bc40a16..b3e05ea1c10 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h @@ -10,8 +10,8 @@ #include "Loopback_Supplier.h" #include "tao/Utils/Servant_Var.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h index 75bfd1cb88f..084c2bd1341 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h @@ -10,8 +10,8 @@ #define TAO_RTEC_LOOPBACK_SUPPLIER_H #include "rtec_perf_export.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp index 906dacdfdcd..74741e0f8be 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp @@ -15,8 +15,8 @@ #include "Auto_Disconnect.h" #include "Loopback.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Gateway_IIOP.h" ACE_RCSID (TAO_RTEC_Perf, Peer_Base, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h index aaed29be88d..3733441998b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h @@ -11,7 +11,7 @@ #define TAO_RTEC_PERF_PEER_BASE_H #include "Federated_TestS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp index f5516c30508..408b52b3557 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp @@ -9,9 +9,9 @@ #include "RTEC_Initializer.h" #include "RTCORBA_Setup.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_RTCORBA_Factory.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp index 096d2f09cbd..4e4260a89f9 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp @@ -8,7 +8,7 @@ #include "Send_Task.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "ace/Barrier.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h index cc3878a8be1..6a04b5f7049 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h @@ -10,8 +10,8 @@ #define TAO_PERF_RTEC_SUPPLIER_H #include "rtec_perf_export.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once 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 { diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.h b/TAO/orbsvcs/tests/Concurrency/CC_client.h index 5c945b65f10..a81df69daa0 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/orbsvcs/CosConcurrencyControlC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosConcurrencyControlC.h" +#include "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 e502874a740..6f97b31d7c0 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -20,7 +20,7 @@ #include "CC_naming_service.h" #include "ace/ACE.h" #include "ace/Process.h" -#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/CosConcurrencyControlC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h index 9992d80c6f7..735d38d7c21 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h @@ -20,7 +20,7 @@ // // ============================================================================ -#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "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 2b161c63d94..8a67df0eb67 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/orbsvcs/CosConcurrencyControlC.h" +#include "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 3dfbcff8b44..6c04a55541c 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/orbsvcs/CosConcurrencyControlC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/CosNamingC.h" +#include "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 95a4605d582..4c1a643f863 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/orbsvcs/CosConcurrencyControlC.h" +#include "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 7417c23235d..9f0083fd2ad 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_tests.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.h @@ -18,8 +18,8 @@ // // ============================================================================ -#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/CosNamingC.h" #include "CC_naming_service.h" #ifndef _CC_TESTS_H_ diff --git a/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp b/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp index 3c8d0dcdd5f..ecddc658428 100644 --- a/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp +++ b/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp @@ -5,7 +5,7 @@ // The contents of this file REALLY should be generated by the IDL // compiler, but that functionality isn't available yet. -#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/CosConcurrencyControlC.h" ACE_RCSID(Concurrency, tmplinst, "$Id$") diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp index 7b6b3cb0345..4c3faefd58f 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp @@ -3,9 +3,9 @@ #include "Counting_Supplier.h" #include "Counting_Consumer.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" ACE_RCSID (CEC_Tests, Disconnect, diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp index a31c7a75652..cb87203f303 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp @@ -4,8 +4,8 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" ACE_RCSID (CEC_Tests, MT_Disconnect, diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h index a6e077c91cc..06a263e9178 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/orbsvcs/CosEventChannelAdminC.h" +#include "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 ce3a0ee4b2d..abaa9184f9b 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp @@ -2,8 +2,8 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (CEC_Tests_Basic, diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp index a0ebb93aef3..3ff9f720233 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp @@ -2,8 +2,8 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (CEC_Tests_Basic, diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index d74044224ce..0c5aea70a2f 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -1,8 +1,8 @@ // $Id$ #include "Random.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Arg_Shifter.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h index d40b29ab84a..450fe418668 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/orbsvcs/CosEventCommS.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventCommS.h" +#include "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 2a63a37184c..eee8e47f1a3 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp @@ -2,8 +2,8 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" ACE_RCSID( CEC_Tests_Basic, Shutdown, diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h index fbcc070662d..d3ec2cbbb33 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/orbsvcs/CosEventCommS.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/CosEventCommS.h" +#include "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 c33b963a13e..5f557db27ee 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/orbsvcs/CosEventCommS.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/CosEventCommS.h" +#include "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 6e3a7cb607a..a84b5e24821 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/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/CosNamingC.h" #include "tao/Timeprobe.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h index 5b266e18c7b..1d0adde39fd 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/orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Channel_Clients_T.h" +#include "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 de6f6b043e3..1ef30218a5f 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -8,10 +8,10 @@ #include "tao/Timeprobe.h" #include "tao/CDR.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 "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Time_Utilities.h" +#include "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 1aa98e8bea8..10b3adb9270 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/orbsvcs/Channel_Clients_T.h" +#include "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 d0be5f4851c..232f63a5071 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/orbsvcs/RtecUDPAdminS.h" +#include "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 b43c33fd181..23e8b6b0e2a 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/orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecEventChannelAdminS.h" +#include "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 415b4b19eea..1e1d9fdaa17 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/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "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 67512d83d65..6fbed6275f2 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/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 "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 "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp index 38ee3a1f8f5..851d74512e0 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/orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecEventChannelAdminS.h" +#include "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 b2618c5d810..8f9f50f2a87 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/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "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 16d1cab1b1f..2746a69f222 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/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h index c7e4d93e777..a1044cb15aa 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/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" +#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" class ECM_Driver; diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 1f2e5c7c3a4..08196317846 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/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 "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 "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h index e3491190859..4bf7784e0cd 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/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" +#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" class Test_ECG; diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h index d5e25a0cafa..a6de5dd6f1d 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/orbsvcs/Scheduler_Factory.h" +#include "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 3e89bc2e87b..44b87de3f80 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/orbsvcs/Scheduler_Factory.h" +#include "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 44a0458b555..86089e80ff4 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/orbsvcs/Scheduler_Factory.h" +#include "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 548da9e2e8b..1c262087f3e 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/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/Timeprobe.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h index e5c69dd1ad5..6a086b38087 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/orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/RtecSchedulerC.h" +#include "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 366639f8332..5c4ef131935 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/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/Timeprobe.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h index ba33ea4adef..4af70e0f7a8 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/orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Channel_Clients_T.h" +#include "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 4012a5b8130..4e687d7a67b 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/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/Timeprobe.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h index ee5dcf255d2..17fbcb8ce02 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/orbsvcs/Channel_Clients_T.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "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 082b1bfa826..cf4ff7d1d1b 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/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/Timeprobe.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h index e295690f6e5..e51f0f73551 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/orbsvcs/Channel_Clients_T.h" +#include "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 21fe2ee77e3..9d5395e9569 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/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 "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 "tao/Timeprobe.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index 308906f4f86..d7e4362d17c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -5,10 +5,10 @@ #include "ace/OS_NS_unistd.h" -#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/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, diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h index 93b84af5c2d..6aafd6e9dce 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/orbsvcs/Channel_Clients.h" +#include "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 4e085a1df56..9ea02908ff1 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -3,7 +3,7 @@ #include "BCast.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h" +#include "orbsvcs/Event/ECG_Mcast_Gateway.h" #include "tao/ORB_Core.h" #include "ace/Arg_Shifter.h" #include "ace/INET_Addr.h" diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h index 5ec95b193a8..8cbcfa4c368 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/orbsvcs/RtecUDPAdminS.h" +#include "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 2e9c750ccf5..784bb9e422f 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp @@ -3,10 +3,10 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#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/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, diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp index 5beec0820a2..5a021eb4e08 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp @@ -2,10 +2,10 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#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/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, diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index 0962fd2b630..cdc7369cbac 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -5,10 +5,10 @@ #include "ace/OS_NS_unistd.h" -#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/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, diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h index ac641891b4b..2df1cb7e3ea 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/orbsvcs/Channel_Clients.h" +#include "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 425e6b97eca..22af3ce4a99 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp @@ -3,10 +3,10 @@ #include "Counting_Supplier.h" #include "Counting_Consumer.h" -#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/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, diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp index d908603bb20..39c750d1a4d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp @@ -2,11 +2,11 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#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" +#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, diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp index f2349ee5a21..51d2bd3c3fb 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -4,10 +4,10 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#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/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, diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h index 03e058934e1..06855260d66 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/orbsvcs/RtecEventChannelAdminC.h" +#include "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 44a50a10b13..83fbdf77e04 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp @@ -3,10 +3,10 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#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/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, diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index 58253b839bd..afb1653bab4 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -3,8 +3,8 @@ #include "Observer.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" #include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h index 13ae141293c..bb788c01258 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/orbsvcs/Event/EC_Gateway_IIOP.h" +#include "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 f7bb82adc85..b9397f997ed 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -1,10 +1,10 @@ // $Id$ #include "Random.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 "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "ace/Arg_Shifter.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h index 727806f0be0..22fd387192b 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/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventCommS.h" +#include "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 ba63f91ba2d..7bb4b36492f 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -3,7 +3,7 @@ #include "Reconnect.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp index 79fbf4580fe..aa7906a0cd9 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp @@ -3,10 +3,10 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#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/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, diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp index 868ff9b95f2..af77cc9fcbd 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp @@ -2,10 +2,10 @@ #include "Counting_Consumer.h" #include "Counting_Supplier.h" -#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/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, diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp index 33207f3d371..5fe05170a84 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/orbsvcs/Event/EC_Event_Channel.h" +#include "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 22b1f7a328e..a8421c9334e 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/orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/RtecEventChannelAdminS.h" +#include "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 8c33c404bb5..667ac9e8efb 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/orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h" -#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/ECG_Mcast_Gateway.h" +#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" #include "ace/Get_Opt.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h index f4471a4eaa6..bc1faae8c3b 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" #define A_EVENT_TYPE ACE_ES_EVENT_UNDEFINED+1 #define B_EVENT_TYPE A_EVENT_TYPE+1 diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index ffdb42a1858..d04907a35f1 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -1,10 +1,10 @@ // $Id$ #include "Constants.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" +#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" class EC_Consumer: public POA_RtecEventComm::PushConsumer, diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp index 37d8edcaa0d..ab13f1a28ef 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp @@ -1,9 +1,9 @@ // $Id$ #include "Constants.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/RtecEventCommC.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #include "ace/Log_Msg.h" void diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h index f5093028608..45bca620bf2 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" #define EVENT_TYPE ACE_ES_EVENT_UNDEFINED+1 #define SOURCE_ID ACE_ES_EVENT_SOURCE_ANY+1 diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp index 069a9d8701d..d7d0b4f1973 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp @@ -1,9 +1,9 @@ // $Id$ #include "Constants.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/RtecEventCommC.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #include "ace/Log_Msg.h" void diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h index 2e5814a3957..6a6919f964d 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" #define HEARTBEAT ACE_ES_EVENT_UNDEFINED+1 #define SOURCE_ID ACE_ES_EVENT_SOURCE_ANY+1 diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index 1ef97c20ec3..fabc0999002 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -2,13 +2,13 @@ #include "Constants.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h" -#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h" -#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/Event/ECG_UDP_Sender.h" +#include "orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index 1860291e40d..afb5e07dc4d 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -3,7 +3,7 @@ #include "Connect.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp index b1f33edb93b..1d78d070ce7 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -3,8 +3,8 @@ #include "Inversion.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event_Utilities.h" #include "ace/Sched_Params.h" #include "ace/Arg_Shifter.h" diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index 7d0a54f78c6..23c11650fd9 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/orbsvcs/Event_Service_Constants.h" +#include "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 365e21bcf2c..3b6880e36b5 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/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "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 0b79f385e8a..875bbf1803d 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/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "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 31ae3910a5d..67c7ce2277f 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -3,7 +3,7 @@ #include "Throughput.h" #include "Consumer.h" #include "Supplier.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Get_Opt.h" ACE_RCSID (EC_Tests_Performance, diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp index 3be234ab90f..50a090f74c5 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp @@ -1,8 +1,8 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h index ce3c6678d39..439b95f9747 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/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "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 482a9afc68e..06878cb4b9f 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/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "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 712c6a15215..4b63fcae605 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Counting_Supplier.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event_Utilities.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (EC_Tests, diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h index da4b7f67172..cc76b3a6e91 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/orbsvcs/Channel_Clients.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Channel_Clients.h" +#include "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 a359c8a570e..e80efa46881 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/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 "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 "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h index b6165e14ab4..c902b4a7052 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/orbsvcs/RtecEventChannelAdminS.h" +#include "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 97a49df7d5d..a644d926bb6 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -1,8 +1,8 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/Event_Utilities.h" #include "tao/debug.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h index 9f4b5820fb1..065a20a15aa 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/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "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 7416446bbe6..b23e08cf1ae 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/orbsvcs/PortableGroup/PG_FactoryRegistry.h" +#include "orbsvcs/PortableGroup/PG_FactoryRegistry.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index bfe9a4790e1..1c10cfed7aa 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -14,10 +14,10 @@ #include "FT_TestReplica_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/PortableGroupC.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h" +#include "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_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp index 57f2789169d..0af57a70274 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/orbsvcs/FT_ReplicationManagerC.h" +#include "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 7df01cb3cfc..b9d41ed7429 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/orbsvcs/FT_Replica.idl" +#include "orbsvcs/FT_Replica.idl" module FT_TEST { diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp index b60de378ad5..66e48bc950c 100755 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp @@ -4,7 +4,7 @@ #include "ReplicationManagerFaultConsumerAdapter.h" #include "ace/Get_Opt.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" #include "orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp index f2bec9e8df6..2ed7b7baca0 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp @@ -5,7 +5,7 @@ #include "StubBatchConsumer.h" #include "ace/Get_Opt.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubBatchConsumer::StubBatchConsumer () : quit_(0) diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index cbcb441ae9e..f66171dec1a 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/orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp index 016f086f327..33c4491e7f1 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp @@ -5,7 +5,7 @@ #include "StubFaultConsumer.h" #include "ace/Get_Opt.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubFaultConsumer::StubFaultConsumer () : quit_(0) diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h index 630bad0d6e9..da989823fb9 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h @@ -10,7 +10,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include <orbsvcs/orbsvcs/FT_NotifierC.h> ////////////////////// diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index 64f1adf3bb5..47b2453d95e 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp @@ -6,7 +6,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include #include "ace/streams.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 53b36402947..4c9d10a1936 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/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/ORB_Constants.h" #include "tao/CDR.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 800f6eacbfa..82ac5cdec4b 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/orbsvcs/FaultTolerance/FT_Service_Activate.h" +#include "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 5d959174ed5..ee1bd7e9d0e 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/orbsvcs/FaultTolerance/FT_Service_Activate.h" -#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FaultTolerance/FT_Service_Activate.h" +#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "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 3cb915df554..543da3eff4f 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -6,8 +6,8 @@ #include "ace/Read_Buffer.h" #include "tao/IORManipulation/IORManip_Loader.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h" -#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/FaultTolerance/FT_Service_Activate.h" +#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_fcntl.h" diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp index 9d85a48410e..72014970c1d 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp @@ -18,8 +18,8 @@ //========================================================================= #include "tao/ORB.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" -#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" ACE_RCSID(IOGRManipluation, IOGRTest, diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp index 0d5a1bd90e0..bb03eff19a1 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/orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "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 330cb279194..11c5601a36e 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/orbsvcs/RtecEventCommS.h" +#include "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 cb16b1b042f..8c1b1757ecf 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/CosNamingC.h" +#include "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/orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" ACE_RCSID (FtRtEvent, PushSupplier, diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h index 1307b2d27b7..b286fd96926 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/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventCommS.h" +#include "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 52afdd7fddb..8fabe5d60d4 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp @@ -1,18 +1,18 @@ // $Id$ -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/Event_Utilities.h" #include "PushConsumer.h" #include "ace/Get_Opt.h" -#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h" -#include "orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" +#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" /// include this file to statically linked with FT ORB -#include "orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h" +#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" /// include this file to statically linked with Transaction Depth -#include "orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" +#include "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 d2383d84e9c..bd0b1bf3238 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp @@ -1,16 +1,16 @@ // $Id$ -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "PushSupplier.h" #include "ace/Get_Opt.h" -#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h" -#include "orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" +#include "orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" /// include this file to statically linked with FT ORB -#include "orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h" +#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" /// include this file to statically linked with Transaction Depth -#include "orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" +#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" ACE_RCSID (FtRtEvent, supplier, diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h index 40a13661091..35844172cac 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h +++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h @@ -5,7 +5,7 @@ #ifndef SERVER_I_H #define SERVER_I_H -#include "orbsvcs/orbsvcs/IOR_Multicast.h" +#include "orbsvcs/IOR_Multicast.h" class Server_i { diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp index defc5e21897..b885f1b28ed 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp @@ -2,7 +2,7 @@ // $Id$ // -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/Log_Msg.h" diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h index 11f367176f8..930aeaf426a 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h @@ -24,7 +24,7 @@ #define NCONTEXTEXT_CLIENT_I_H #include "Web_ServerC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" class NContextExt_Client_i { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h index 6ddc01606b7..6e061d588c4 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h @@ -6,8 +6,8 @@ #define BASIC_H #include "TestS.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/PortableGroupC.h" #if defined (_MSC_VER) # if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h index c3567cc2ce3..c82ed1c073b 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h @@ -12,8 +12,8 @@ //============================================================================= -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/PortableGroupC.h" #include "tao/PortableServer/PortableServer.h" // Forward Declaration of the kind of servant we would like to handle diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h index ead0fe0230e..5b0513e2e5f 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h @@ -6,7 +6,7 @@ #define FACTORY_H #include "Factory_Map.h" -#include "orbsvcs/orbsvcs/PortableGroupS.h" +#include "orbsvcs/PortableGroupS.h" #include "ace/Null_Mutex.h" #if defined (_MSC_VER) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h index eec9e8e1133..9b0513431dc 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h @@ -12,8 +12,8 @@ //============================================================================= -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/PortableGroupC.h" #include "tao/PortableServer/PortableServer.h" /** diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h index 20a8851d235..c0a82d6a630 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h @@ -6,8 +6,8 @@ #define BASIC_H #include "TestS.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/PortableGroupC.h" #if defined (_MSC_VER) # if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h index f258bdfdee5..dd8366cf547 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h @@ -12,8 +12,8 @@ //============================================================================= -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/PortableGroupC.h" #include "tao/PortableServer/PortableServer.h" // Forward Declaration of the kind of servant we would like to handle diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h index 70000152112..d023b875a7e 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h @@ -6,8 +6,8 @@ #define SIMPLE_H #include "TestS.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/PortableGroupC.h" #if defined (_MSC_VER) # if (_MSC_VER >= 1200) 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 e8f5116c435..78b92cc6fc3 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/orbsvcs/Time_Utilities.h" +#include "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 e60b1ecddc5..031c19ba769 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/orbsvcs/DsLogAdminC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/DsLogAdminC.h" +#include "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 6d96f438923..d6e52a015d8 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp @@ -3,8 +3,8 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" #include "tao/debug.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" #include "IdAssignment.h" ACE_RCSID (Notify_Tests, diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h index 581fa2be9b5..7b4a7e3920f 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/orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/CosNotifyChannelAdminC.h" class IdAssignment { diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h index fd234dcc6e5..19352ec0150 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/orbsvcs/TimeBaseC.h" +#include "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 c930e066381..475e5719d0d 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" #include "Notify_Structured_Push_Consumer.h" -#include "orbsvcs/orbsvcs/Notify/Notify_Extensions.h" +#include "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 86b160c2e0a..8041f156b35 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/orbsvcs/TimeBaseC.h" +#include "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 bae1c684bf7..97db6fc7f80 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp @@ -7,9 +7,9 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNamingC.h" +#include "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 d1220a50e02..03c7ce9214a 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/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNamingC.h" +#include "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 be72b75214f..c88d7dc082d 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/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 aaa7826b07f..0e37aa80491 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/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" const char* Any_String (const CORBA::Any& any); diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp index c829b8efa06..b437d7b75e3 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp +++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp @@ -1,7 +1,7 @@ //$Id$ #include "../lib/Notify_Test_Client.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" #include "ace/OS_main.h" int 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 7e752c1189f..4ad43dcb356 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" #include "Notify_Sequence_Push_Consumer.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "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 8e5713ebb2d..46516422f0f 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp @@ -7,8 +7,8 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 79cf4ff3634..427fc996aea 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/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNamingC.h" +#include "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 fe185bd3254..18563673738 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp @@ -7,8 +7,8 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 050a2976d53..47302392e00 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/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNamingC.h" +#include "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 be72b75214f..c88d7dc082d 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/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 aaa7826b07f..0e37aa80491 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/orbsvcs/CosNotifyChannelAdminS.h" +#include "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 5e7b8b6f034..1486816ff5e 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/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 80f3d3ad428..f50a5bc3846 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/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 f6dc8e42ab5..94fdf02c5c1 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" #include "Notify_Sequence_Push_Consumer.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "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 588d83caffc..0e2973152ad 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" #include "Notify_Structured_Push_Consumer.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "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 ad410ec2af8..ca6de9a909a 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp @@ -7,8 +7,8 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 0434804c2be..f689cb5b866 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp @@ -9,10 +9,10 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNamingC.h" +#include "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 a2c96e61b66..b06369cba80 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp @@ -7,8 +7,8 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 cd1c1b579b4..de8e0d5aae6 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp @@ -9,10 +9,10 @@ #include "tao/ORB_Core.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNamingC.h" +#include "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 be72b75214f..c88d7dc082d 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/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 54ce6c9720a..679adb0a42c 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/orbsvcs/CosNotifyChannelAdminS.h" +#include "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 4a3ac0a1c4d..188dc2a032c 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 @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" #include "Notify_Sequence_Push_Consumer.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "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 a2bfacea20d..ac2b673cd99 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 @@ -7,8 +7,8 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 a99fcaa6aec..62127227df9 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/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNamingC.h" +#include "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 be72b75214f..c88d7dc082d 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/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 aaa7826b07f..0e37aa80491 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/orbsvcs/CosNotifyChannelAdminS.h" +#include "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 509fe631c00..5b3e48d271f 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 @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" #include "Notify_Sequence_Push_Consumer.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "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 e64fd49f725..9cc7a728152 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp @@ -7,8 +7,8 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 6f2a32690c9..a6c6bac9662 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/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 be72b75214f..c88d7dc082d 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/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 aaa7826b07f..0e37aa80491 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/orbsvcs/CosNotifyChannelAdminS.h" +#include "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 622080e1b27..54406640c59 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp @@ -7,9 +7,9 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 fba45d19f79..74a90e7f845 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/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 915ce0f8e61..1673dd1975a 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp @@ -7,9 +7,9 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 8b4d62ec7b7..829bc0b9b08 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/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 0efa9039997..4b2e1021bdb 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/orbsvcs/CosNotifyFilterS.h" +#include "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 75d395824ae..dd0588a2543 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/orbsvcs/CosNotifyFilterS.h" -#include "orbsvcs/orbsvcs/Notify/FilterFactory.h" +#include "orbsvcs/CosNotifyFilterS.h" +#include "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 429cfe0ca99..a94146e47bc 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/orbsvcs/CosNotifyChannelAdminC.h" +#include "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 1a94c4f4291..2c4aeb81e78 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/orbsvcs/CosNotifyChannelAdminC.h" +#include "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 24e263b908c..2678b6c4437 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/orbsvcs/CosNotifyChannelAdminC.h" +#include "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 bba40b99762..6cd7f1da60d 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/orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "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 b85f6540d86..60a1e436d08 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/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 0a257ceed2d..2134941a87f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp @@ -7,7 +7,7 @@ ACE_RCSID (lib, "$Id$") #include "tao/debug.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "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 6cdc20933b0..7acd1919324 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/orbsvcs/CosNotificationC.h" +#include "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 f6e11655d40..293218f1ae5 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp @@ -14,7 +14,7 @@ ACE_RCSID (lib, #include "Name.h" #include "LookupManager.h" #include "Options_Parser.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "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.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h index 2df32f45f92..3273306214b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/CosNotifyChannelAdminC.h" #include "tao/PortableServer/PortableServer.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp index 8a042567060..279291b2db2 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp @@ -17,7 +17,7 @@ ACE_RCSID (Notify, #include "Name.h" #include "LookupManager.h" #include "Options_Parser.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "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 116f4d7fedf..66d655dd9b6 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp @@ -5,7 +5,7 @@ #include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" #include "tao/debug.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "StructuredEvent.h" #include "Task_Stats.h" #include "Task_Callback.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp index 78929ec2730..7b3e5527ed7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp @@ -13,7 +13,7 @@ ACE_RCSID (lib, #include "Direct_Consumer.h" #include "Activation_Manager.h" #include "Options_Parser.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "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 977c0f22f64..d258c7e2e8a 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/orbsvcs/CosNotifyChannelAdminC.h" +#include "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 ded6a360841..f637105b924 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp @@ -8,7 +8,7 @@ #include "ace/OS_NS_unistd.h" #include "tao/debug.h" #include "tao/ORB_Core.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "StructuredEvent.h" #include "Task_Stats.h" #include "Task_Callback.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp index 6b97740e3ca..0378605ffea 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp @@ -12,7 +12,7 @@ ACE_RCSID (lib, #include "Direct_Supplier.h" #include "Activation_Manager.h" #include "Options_Parser.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "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 a03215cb7b4..726d7cd0ddd 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/orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" class TAO_Notify_Tests_Periodic_Supplier; diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h index 4c624eb407b..5aae9203447 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/NotifyExtC.h" #include "Consumer_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h index bce5a9a9c9e..edf2753e87d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/NotifyExtC.h" #include "Supplier_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h index a462f94db79..7e4a4773b27 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/NotifyExtC.h" #include "Consumer_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h index 441348257e3..dad8bd6d0eb 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/NotifyExtC.h" #include "Supplier_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h index a2a5b236df8..dddecec4dc1 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/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" /** * @class TAO_Notify_Tests_StructuredEvent diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h index a83edf24f79..43ee9ffec52 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/NotifyExtC.h" #include "Consumer_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h index e7c04d2e82d..e1c11dc6a54 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/NotifyExtC.h" #include "Supplier_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h index 10c011ee66d..fbed3172551 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/orbsvcs/CosNotifyChannelAdminC.h" +#include "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 a0cfc9f8a46..1ff4cb087c0 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/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 cff6c00dfe3..124dca8a155 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/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 541266d8cd1..8c543bd6b44 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/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 5644e71b127..c3cc5ac0f4a 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/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 be72b75214f..c88d7dc082d 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/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 aaa7826b07f..0e37aa80491 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/orbsvcs/CosNotifyChannelAdminS.h" +#include "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 1dcc9f2e98a..cbb435d4295 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -4,7 +4,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" ACE_RCSID (Notify, 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 6759d3bc543..a6d83524294 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/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "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 a298517a58d..24c72c47766 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -9,8 +9,8 @@ #include "ace/Dynamic_Service.h" #include "tao/Strategies/advanced_resource.h" #include "tao/Messaging/Messaging.h" -#include "orbsvcs/orbsvcs/Notify/Service.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Notify/Service.h" +#include "orbsvcs/Time_Utilities.h" ACE_RCSID (Notify_Tests, Throughput, diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h index 9ff5ad078b2..68ea5861f2e 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/orbsvcs/Property/CosPropertyService_i.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Property/CosPropertyService_i.h" +#include "orbsvcs/Naming/Naming_Utils.h" class Client { diff --git a/TAO/orbsvcs/tests/Property/server.h b/TAO/orbsvcs/tests/Property/server.h index afe9808e3bf..b83f28e09dd 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/orbsvcs/Property/CosPropertyService_i.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Property/CosPropertyService_i.h" +#include "orbsvcs/Naming/Naming_Utils.h" #endif /* COSPROPERTYSERVICE_SERVER_H */ diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 786f53ab34b..2a863baa4f3 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -17,8 +17,8 @@ // ============================================================================ #include "test_objectS.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/Naming/Naming_Utils.h" #include "tao/PortableServer/ORB_Manager.h" #include "tao/debug.h" #include "ace/Get_Opt.h" diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp index 4b580b8ed46..fe06daf6ba8 100644 --- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp +++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Sched/Strategy_Scheduler.h" +#include "orbsvcs/Time_Utilities.h" #if defined (ACE_HAS_QUANTIFY) # include <quantify.h> #endif /* ACE_HAS_QUANTIFY */ diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp index 74272df5877..e15b33968f3 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp @@ -6,9 +6,9 @@ #include "ace/Sched_Params.h" #include "ace/Get_Opt.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Naming/Naming_Utils.h" ACE_RCSID (Sched_Conf, Sched_Conf, 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 618d490c664..c2b447fab3a 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp @@ -5,7 +5,7 @@ #include "tao/ORB_Core.h" #include "tao/Thread_Lane_Resources.h" #include "tao/Transport_Cache_Manager.h" -#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h" +#include "orbsvcs/SSLIOP/SSLIOP_Transport.h" #include "ace/OS_NS_unistd.h" #if !defined(__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h index 3188c58be17..144006f317e 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/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.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 cfc5da04d59..ea861c51cd2 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/orbsvcs/SecurityC.h" +#include "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 4fd7687a525..4243f3ab3dc 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/orbsvcs/SecurityLevel1C.h" +#include "orbsvcs/SecurityLevel1C.h" #include "openssl/x509.h" class SLevel1_Server_i : public POA_SLevel1_Server diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h index 94e0c1c5ae7..02afd729403 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/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/CosNamingC.h" +#include "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 8d00d712578..03802c59511 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.h +++ b/TAO/orbsvcs/tests/Time/Client_i.h @@ -18,8 +18,8 @@ // // ============================================================================ -#include "orbsvcs/orbsvcs/TimeServiceC.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/TimeServiceC.h" +#include "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 a4d447cb7d7..2a5e78885b3 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/orbsvcs/Trader/Trader_Utils.h" +#include "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 b18406139fb..28cf7b442dd 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/orbsvcs/Trader/Trader_Utils.h" +#include "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 c19395fb428..dfd8d90740e 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/orbsvcs/Trader/Trader_Utils.h" +#include "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 d6f776e7465..de4935df75c 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/orbsvcs/CosTradingC.h" -#include "orbsvcs/orbsvcs/CosTradingReposC.h" -#include "orbsvcs/orbsvcs/CosTradingDynamicC.h" +#include "orbsvcs/CosTradingC.h" +#include "orbsvcs/CosTradingReposC.h" +#include "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 cf25819a70a..aa780f7e187 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -6,8 +6,8 @@ #include "Offer_Exporter.h" #include "Offer_Importer.h" #include "Service_Type_Exporter.h" -#include "orbsvcs/orbsvcs/Trader/Trader.h" -#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/Trader/Trader.h" +#include "orbsvcs/Trader/Service_Type_Repository.h" ACE_RCSID (Trading, colocated_test, diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index 582c340445e..23fc4c88e83 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -5,8 +5,8 @@ #include "Offer_Importer.h" #include "Service_Type_Exporter.h" #include "ace/Auto_Ptr.h" -#include "orbsvcs/orbsvcs/Trader/Trader.h" -#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/Trader/Trader.h" +#include "orbsvcs/Trader/Service_Type_Repository.h" ACE_RCSID (Trading, export_test, diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h index 04dfc884fbb..96fbbdd52d9 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h @@ -24,7 +24,7 @@ #define IOR_CORBANAME_CLIENT_I_H #include "corbanameC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" class IOR_corbaname_Client_i { diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp index 1da3867a5da..4582f0445a0 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp @@ -1,7 +1,7 @@ // $Id$ #include "status_i.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" int main (int argc, char* argv[]) { diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h index 975fdeed1ab..588119e4e98 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.h +++ b/TAO/performance-tests/POA/Demux/demux_test_server.h @@ -25,7 +25,7 @@ #include "ace/Log_Msg.h" #include "tao/Timeprobe.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Naming/Naming_Utils.h" #include "demux_test_i.h" #include "demux_test_macros.h" diff --git a/TAO/utils/NamingViewer/BindDialog.h b/TAO/utils/NamingViewer/BindDialog.h index a32ec385597..afb39a5739f 100644 --- a/TAO/utils/NamingViewer/BindDialog.h +++ b/TAO/utils/NamingViewer/BindDialog.h @@ -8,7 +8,7 @@ // BindDialog.h : header file // #include "tao/corba.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" ///////////////////////////////////////////////////////////////////////////// // CBindDialog dialog diff --git a/TAO/utils/NamingViewer/BindNewContext.h b/TAO/utils/NamingViewer/BindNewContext.h index 48f4c7073f3..ac243f51b91 100644 --- a/TAO/utils/NamingViewer/BindNewContext.h +++ b/TAO/utils/NamingViewer/BindNewContext.h @@ -7,7 +7,7 @@ #endif // _MSC_VER > 1000 // BindNewContext.h : header file // -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" ///////////////////////////////////////////////////////////////////////////// // CBindNewContext dialog diff --git a/TAO/utils/NamingViewer/NamingObject.h b/TAO/utils/NamingViewer/NamingObject.h index ce257320641..5dd5a1fed27 100644 --- a/TAO/utils/NamingViewer/NamingObject.h +++ b/TAO/utils/NamingViewer/NamingObject.h @@ -10,7 +10,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" class CNamingObject { diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.h b/TAO/utils/NamingViewer/NamingTreeCtrl.h index dcfe3b12a9c..8c871ad3792 100644 --- a/TAO/utils/NamingViewer/NamingTreeCtrl.h +++ b/TAO/utils/NamingViewer/NamingTreeCtrl.h @@ -7,7 +7,7 @@ #endif // _MSC_VER > 1000 // NamingTreeCtrl.h : header file // -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" class CNamingObject; ///////////////////////////////////////////////////////////////////////////// diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.cpp b/TAO/utils/NamingViewer/NamingViewerDlg.cpp index 356f90237bd..beeb4dc500d 100644 --- a/TAO/utils/NamingViewer/NamingViewerDlg.cpp +++ b/TAO/utils/NamingViewer/NamingViewerDlg.cpp @@ -4,7 +4,7 @@ #include "NamingViewer.h" #include "NamingViewerDlg.h" #include "ViewIORDialog.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Naming/Naming_Utils.h" #include "SelectNSDialog.h" #ifdef _DEBUG diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.h b/TAO/utils/NamingViewer/NamingViewerDlg.h index 4ddbe2e6e36..fbda6676e4d 100644 --- a/TAO/utils/NamingViewer/NamingViewerDlg.h +++ b/TAO/utils/NamingViewer/NamingViewerDlg.h @@ -9,7 +9,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "NamingTreeCtrl.h" ///////////////////////////////////////////////////////////////////////////// // CNamingViewerDlg dialog diff --git a/TAO/utils/nslist/nsadd.cpp b/TAO/utils/nslist/nsadd.cpp index 591998b48cd..ba619da9b2a 100644 --- a/TAO/utils/nslist/nsadd.cpp +++ b/TAO/utils/nslist/nsadd.cpp @@ -17,7 +17,7 @@ // // ================================================================ -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp index 0d913af8c7f..339273c7882 100644 --- a/TAO/utils/nslist/nsdel.cpp +++ b/TAO/utils/nslist/nsdel.cpp @@ -17,7 +17,7 @@ // // ================================================================ -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp index 62791689bf9..46acd2d6b4a 100644 --- a/TAO/utils/nslist/nslist.cpp +++ b/TAO/utils/nslist/nslist.cpp @@ -15,7 +15,7 @@ #include "ace/SString.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "tao/Endpoint.h" #include "tao/Profile.h" #include "tao/Stub.h" |